From: Nico Cesar <nico@nicocesar.com>
Date: Mon, 31 Aug 2020 18:28:28 +0000 (-0400)
Subject: Installing extra python3 libraries:dist_wheel has to go before PyYAML
X-Git-Tag: 2.1.0~75^2~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0ea4bd88c687a6c7c5067bdd05fb1e6f7e8fb8b9

Installing extra python3 libraries:dist_wheel has to go before PyYAML

refs #15888

Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico@curii.com>
---

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 4d8075fab9..ca99a97730 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -648,12 +648,12 @@ install_env() {
     # Needed for run_test_server.py which is used by certain (non-Python) tests.
     (
         set -e
+        "${VENV3DIR}/bin/pip3" install wheel
         "${VENV3DIR}/bin/pip3" install PyYAML
         "${VENV3DIR}/bin/pip3" install httplib2 
         "${VENV3DIR}/bin/pip3" install future
         "${VENV3DIR}/bin/pip3" install google-api-python-client
         "${VENV3DIR}/bin/pip3" install ciso8601
-        "${VENV3DIR}/bin/pip3" install wheel
         "${VENV3DIR}/bin/pip3" install pycurl
         "${VENV3DIR}/bin/pip3" install ws4py
         cd "$WORKSPACE/sdk/python"
diff --git a/go.mod b/go.mod
index 131073ff2c..0aa5ca0b1f 100644
--- a/go.mod
+++ b/go.mod
@@ -63,7 +63,7 @@ require (
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
-	golang.org/x/tools v0.0.0-20200826040757-bc8aaaa29e06 // indirect
+	golang.org/x/tools v0.0.0-20200827143046-df83f4e7c16e // indirect
 	google.golang.org/api v0.13.0
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405
diff --git a/go.sum b/go.sum
index a7b1c8e26a..0a395cd8f8 100644
--- a/go.sum
+++ b/go.sum
@@ -316,6 +316,8 @@ golang.org/x/tools v0.0.0-20200825210148-b72e8bb66c93 h1:ErMtKusKMWYK6suW/qFH25m
 golang.org/x/tools v0.0.0-20200825210148-b72e8bb66c93/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200826040757-bc8aaaa29e06 h1:ChBCbOHeLqK+j+znGPlWCcvx/t2PdxmyPBheVZxXbcc=
 golang.org/x/tools v0.0.0-20200826040757-bc8aaaa29e06/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200827143046-df83f4e7c16e h1:2EJKL5VuS+mDJ/DM+ZLemhhtQrbDqUm2a0QouzMOV8E=
+golang.org/x/tools v0.0.0-20200827143046-df83f4e7c16e/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=