From f8eb7bfd52131f7a353131cc811ab127cbc43953 Mon Sep 17 00:00:00 2001 From: Aarif Date: Tue, 23 Feb 2021 01:04:29 +0500 Subject: [PATCH] fix: updated the upgrade job to install appropriate pip version (#26659) pip version 21 doesn't seem to work well with pip-tools <5.4 --- .github/workflows/upgrade-python-requirements.yml | 3 +++ requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/paver.txt | 2 +- requirements/edx/pip-tools.in | 1 - requirements/edx/pip-tools.txt | 2 +- requirements/edx/testing.txt | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index bc57e493eb..c87666e706 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -26,6 +26,9 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Install pip + run: pip install -r requirements/pip.txt + - name: make upgrade run: | cd $GITHUB_WORKSPACE diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 60a30604cb..0361722744 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -236,7 +236,7 @@ urllib3==1.26.3 # via -r requirements/edx/paver.txt, elasticsearch, ge user-util==1.0.0 # via -r requirements/edx/base.in vine==1.3.0 # via amqp, celery voluptuous==0.12.1 # via ora2 -watchdog==2.0.1 # via -r requirements/edx/paver.txt +watchdog==2.0.2 # via -r requirements/edx/paver.txt web-fragments==1.0.0 # via -r requirements/edx/base.in, crowdsourcehinter-xblock, edx-sga, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via bleach, html5lib webob==1.8.7 # via xblock, xmodule diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 18f9358e89..764910d16d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -309,7 +309,7 @@ vine==1.3.0 # via -r requirements/edx/testing.txt, amqp, celery virtualenv==20.4.2 # via -r requirements/edx/testing.txt, tox voluptuous==0.12.1 # via -r requirements/edx/testing.txt, ora2 vulture==2.3 # via -r requirements/edx/development.in -watchdog==2.0.1 # via -r requirements/edx/testing.txt +watchdog==2.0.2 # via -r requirements/edx/testing.txt web-fragments==1.0.0 # via -r requirements/edx/testing.txt, crowdsourcehinter-xblock, edx-sga, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via -r requirements/edx/testing.txt, bleach, html5lib webob==1.8.7 # via -r requirements/edx/testing.txt, xblock, xmodule diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 951541d719..e913682130 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -22,5 +22,5 @@ requests==2.25.1 # via -r requirements/edx/paver.in six==1.15.0 # via libsass, mock, paver, python-memcached, stevedore stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys urllib3==1.26.3 # via requests -watchdog==2.0.1 # via -r requirements/edx/paver.in +watchdog==2.0.2 # via -r requirements/edx/paver.in wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in diff --git a/requirements/edx/pip-tools.in b/requirements/edx/pip-tools.in index b7127e0811..50f3de3e19 100644 --- a/requirements/edx/pip-tools.in +++ b/requirements/edx/pip-tools.in @@ -10,4 +10,3 @@ -c ../constraints.txt pip-tools # Contains pip-compile, used to generate pip requirements files -six # Python 2/3 compatibility diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index 446a14c0e7..eac14787a1 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -6,7 +6,7 @@ # click==7.1.2 # via pip-tools pip-tools==5.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/pip-tools.in -six==1.15.0 # via -r requirements/edx/pip-tools.in, pip-tools +six==1.15.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ffbfe8e372..0727ebf2c3 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -287,7 +287,7 @@ user-util==1.0.0 # via -r requirements/edx/base.txt vine==1.3.0 # via -r requirements/edx/base.txt, amqp, celery virtualenv==20.4.2 # via tox voluptuous==0.12.1 # via -r requirements/edx/base.txt, ora2 -watchdog==2.0.1 # via -r requirements/edx/base.txt +watchdog==2.0.2 # via -r requirements/edx/base.txt web-fragments==1.0.0 # via -r requirements/edx/base.txt, crowdsourcehinter-xblock, edx-sga, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via -r requirements/edx/base.txt, bleach, html5lib webob==1.8.7 # via -r requirements/edx/base.txt, xblock, xmodule