From 22e303e8d2825ddb4db15575a1a1927e384be4d1 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 22 Apr 2020 18:09:55 +0300 Subject: [PATCH 1/3] Pin grpcio version --- dev-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6296fdd05..70a10aceb 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,5 @@ pytest pytest-cov pytest-mock codecov -pytoml \ No newline at end of file +pytoml +grpcio==1.27.* \ No newline at end of file From d00245e3bf467c74fa40661ebd2cf199b7b9613a Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Thu, 23 Apr 2020 13:14:32 +0300 Subject: [PATCH 2/3] Upgrade pip --- .circleci/config.yml | 12 ++++++++++++ bootstrap/bootstrap.py | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2bc27fd7..918b1fda3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,14 @@ commands: command: | apt-get update --yes && apt-get install --yes python3 python3-venv git make + upgrade_pip: + description: Upgrade the pip version to 20.0.* + steps: + - run: + name: upgrade pip + command: | + python3 -m pip install -U pip==20.0.* + build_systemd_image: steps: - run: @@ -116,6 +124,9 @@ jobs: - v1-dependencies-py3.6- - setup_venv + + - upgrade_pip + - run: name: install dependencies command: | @@ -211,6 +222,7 @@ jobs: key: v1-dependencies-py3.6-sphinx - setup_venv + - run: name: install dependencies command: | diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 98e724594..434ea35dd 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -153,6 +153,15 @@ def main(): 'git+https://github.com/jupyterhub/the-littlest-jupyterhub.git' ) + # Upgrade pip + run_subprocess([ + os.path.join(hub_prefix, 'bin', 'pip'), + 'install', + '--upgrade', + 'pip==20.0.*' + ]) + logger.info('Upgraded pip') + run_subprocess([ os.path.join(hub_prefix, 'bin', 'pip'), 'install' From b698188e1dcc37ccbc6b8f04ec266256a02e3e52 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Thu, 23 Apr 2020 13:15:34 +0300 Subject: [PATCH 3/3] Remove grpcio pin --- dev-requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 70a10aceb..6296fdd05 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,4 @@ pytest pytest-cov pytest-mock codecov -pytoml -grpcio==1.27.* \ No newline at end of file +pytoml \ No newline at end of file