Lock max version for grpc io to allow building bionic packages.

Fix Azure builds by pinning the azure cli version.
thelastpickle · Dec 6, 2022 · f1afb2f · f1afb2f
1 parent a74d9ce
commit f1afb2f
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - '*.*'
   pull_request:
   release:
     types:

diff --git a/debian/rules b/debian/rules
@@ -30,7 +30,7 @@ export DH_VIRTUALENV_INSTALL_ROOT = /usr/share
 override_dh_virtualenv:
 	dh_virtualenv \
 	  --extra-pip-arg "--no-cache-dir" \
-	  --python /usr/bin/python3 --preinstall=setuptools==40.3.0 --preinstall=pip --preinstall=wheel --builtin-venv
+	  --python /usr/bin/python3 --preinstall=setuptools==40.3.0 --preinstall=pip==21.3.1 --preinstall=wheel --builtin-venv
 
 override_dh_strip:
 	dh_strip --no-automatic-dbgsym -X libssh2 -X libssh -X libgssapi_krb5 -X libcrypto -X libkrb5 -X libk5crypto

diff --git a/packaging/docker-build/Dockerfile b/packaging/docker-build/Dockerfile
@@ -55,6 +55,8 @@ RUN apt-get update \
         libssl-dev \
         wget $EXTRA_PACKAGES
 
+RUN pip3 install --upgrade pip
+
 RUN cd /tmp && \
     wget http://mirrors.kernel.org/ubuntu/pool/universe/d/dh-virtualenv/dh-virtualenv_1.0-1_all.deb && \
     gdebi -n dh-virtualenv*.deb && \

diff --git a/requirements-azure.txt b/requirements-azure.txt
@@ -1 +1 @@
-azure-cli>2.33.1
+azure-cli==2.34.1
diff --git a/requirements-grpc-runtime.txt b/requirements-grpc-runtime.txt
@@ -1,2 +1,2 @@
-grpcio>=1.29.0
-grpcio-health-checking>=1.29.0
+grpcio>=1.29.0,<=1.48.2
+grpcio-health-checking>=1.29.0,<=1.48.2
diff --git a/requirements-grpc.txt b/requirements-grpc.txt
@@ -1,4 +1,4 @@
 protobuf>=3.12.0,<=3.20.1
-grpcio>=1.29.0
-grpcio-tools>=1.29.0
-grpcio-health-checking>=1.29.0
+grpcio>=1.29.0,<=1.48.2
+grpcio-tools>=1.29.0,<=1.48.2
+grpcio-health-checking>=1.29.0,<=1.48.2
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,8 @@ psutil>=5.4.7
 ffwd>=0.0.2
 apache-libcloud<3.4.0,>=3.3.0
 lockfile>=0.12.2
-cryptography<=3.3.2,>=2.5
+pyOpenSSL==22.0.0
+cryptography<=35.0,>=2.5
 pycryptodome>=3.9.9
 retrying>=1.3.3
 ssh2-python==0.27.0

diff --git a/run_integration_tests.sh b/run_integration_tests.sh
@@ -111,9 +111,9 @@ done
 
 export LOCAL_JMX=yes
 export PYTHONWARNINGS="ignore"
-pip3 install -r requirements.txt
-pip3 install -r requirements-grpc.txt
-pip3 install -r requirements-test.txt
+python3 -m pip install -r requirements.txt
+python3 -m pip install -r requirements-grpc.txt
+python3 -m pip install -r requirements-test.txt
 cd tests/integration
 if [ "$LOCAL" == "yes" ]
 then

diff --git a/setup.py b/setup.py
@@ -50,17 +50,18 @@
         'ffwd>=0.0.2',
         'apache-libcloud<3.4.0,>=3.3.0',
         'lockfile>=0.12.2',
-        'cryptography<=3.3.2,>=2.5',
+        'pyOpenSSL==22.0.0',
+        'cryptography<=35.0,>=2.5',
         'pycryptodome>=3.9.9',
         'retrying>=1.3.3',
         'parallel-ssh==2.2.0',
         'ssh2-python==0.27.0',
         'ssh-python>=0.8.0',
         'requests==2.22.0',
         'protobuf>=3.12.0,<=3.20.1',
-        'grpcio>=1.29.0',
-        'grpcio-health-checking>=1.29.0',
-        'grpcio-tools>=1.29.0',
+        'grpcio>=1.29.0,<=1.48.2',
+        'grpcio-health-checking>=1.29.0,<=1.48.2',
+        'grpcio-tools>=1.29.0,<=1.48.2',
         'gevent',
         'greenlet',
         'fasteners==0.16',
@@ -70,7 +71,7 @@
     ],
     extras_require={
         'S3': ["awscli>=1.16.291"],
-        'AZURE': ["azure-cli>=2.24.0"]
+        'AZURE': ["azure-cli==2.34.1"]
     },
     entry_points={
         'console_scripts': [
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ on: @@
       push:
         branches:
           - master
+          - '*.*'
       pull_request:
       release:
         types:
@@ Expand Down @@