Browse Source

Fixed tests for Python 2 in python/release.sh

Setuptools 45.0 removed support for Python 2, so to keep these tests
working for Python 2 I updated the script to install an older setuptools
version.
Adam Cozzette 5 years ago
parent
commit
2ad43bfd3d
1 changed files with 5 additions and 1 deletions
  1. 5 1
      python/release.sh

+ 5 - 1
python/release.sh

@@ -11,7 +11,10 @@ function run_install_test() {
   local PYTHON=$2
   local PYTHON=$2
   local PYPI=$3
   local PYPI=$3
 
 
-  virtualenv -p `which $PYTHON` test-venv
+  # Setuptools 45.0 removed support for Python 2, so to test with Python 2 we
+  # pass --no-setuptools here and then install an older setuptools version
+  # below.
+  virtualenv -p `which $PYTHON` --no-setuptools test-venv
 
 
   # Intentionally put a broken protoc in the path to make sure installation
   # Intentionally put a broken protoc in the path to make sure installation
   # doesn't require protoc installed.
   # doesn't require protoc installed.
@@ -19,6 +22,7 @@ function run_install_test() {
   chmod +x test-venv/bin/protoc
   chmod +x test-venv/bin/protoc
 
 
   source test-venv/bin/activate
   source test-venv/bin/activate
+  pip install "setuptools<45"
   pip install -i ${PYPI} protobuf==${VERSION} --no-cache-dir
   pip install -i ${PYPI} protobuf==${VERSION} --no-cache-dir
   deactivate
   deactivate
   rm -fr test-venv
   rm -fr test-venv