Merge branch 'master' into version-bump

OffchainLabs · Feb 14, 2020 · 07cd330 · 07cd330
2 parents 336a192 + d5260ef
commit 07cd330
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 205 deletions.
diff --git a/packages/arb-provider-ethers/package.json b/packages/arb-provider-ethers/package.json
@@ -29,8 +29,7 @@
         "ethers": "^4.0.44",
         "jayson": "^3.2.0",
         "node-fetch": "^2.6.0",
-        "promise-poller": "^1.9.1",
-        "solidity-bytes-utils": "^0.0.8"
+        "promise-poller": "^1.9.1"
     },
     "devDependencies": {
         "@types/jest": "^25.1.1",

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+-i https://pypi.org/simple
 virtualenv
 web3
 eth-account
diff --git a/scripts/install-deps b/scripts/install-deps
@@ -16,7 +16,13 @@ pip3 install -r requirements-dev.txt --user
 pre-commit install
 
 # Install conan
-virtualenv --no-site-packages vconan
+VIRTUALENV_MAJOR_VERSION=$(pip3 show virtualenv | grep Version | sed 's/.*: //' | sed -n 's/\..*//p')
+if (($VIRTUALENV_MAJOR_VERSION < 20))
+then
+    virtualenv --no-site-packages vconan
+else
+    virtualenv vconan
+fi
 . vconan/bin/activate
 pip3 install --upgrade conan
 # conan nonstd-lite