From 3197db49db6e7e044cb89adf65b632d30df4bab8 Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Wed, 2 Aug 2023 12:17:46 -0400 Subject: [PATCH] fix: Actually use pip lockfile (#376) Otherwise, an existing pip version might be used from the environment, which eventually conflicts with the pip-tools version. (Happened today.) Run a make-upgrade as well, while I'm at it. --- Makefile | 8 +++-- requirements/base.txt | 20 ++++++------ requirements/ci.txt | 10 +++--- requirements/dev.txt | 67 +++++++++++++++++++------------------- requirements/pip-tools.txt | 11 ++++--- requirements/pip.txt | 6 ++-- requirements/testing.txt | 56 +++++++++++++++---------------- 7 files changed, 92 insertions(+), 86 deletions(-) diff --git a/Makefile b/Makefile index b8e46c26..daae799b 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,11 @@ clean: ## remove generated byte code, coverage reports, and build artifacts rm -fr dist/ rm -fr *.egg-info -requirements: ## install development environment requirements +piptools: ## install Python requirements for running pip-tools + pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt + +requirements: piptools ## install development environment requirements pip-sync requirements/dev.txt requirements/private.* selfcheck: ## check that the Makefile is well-formed @@ -27,8 +30,7 @@ selfcheck: ## check that the Makefile is well-formed PIP_COMPILE = pip-compile --rebuild --upgrade $(PIP_COMPILE_OPTS) upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in - pip install -qr requirements/pip-tools.txt +upgrade: piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/requirements/base.txt b/requirements/base.txt index d9d682e6..bb7072d4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,23 +4,23 @@ # # make upgrade # -certifi==2023.5.7 +certifi==2023.7.22 # via requests cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.6 # via -r requirements/base.in -cryptography==40.0.2 +cryptography==41.0.3 # via pyjwt -deprecated==1.2.13 +deprecated==1.2.14 # via pygithub gitdb==4.0.10 # via gitpython -gitpython==3.1.31 +gitpython==3.1.32 # via -r requirements/base.in idna==3.4 # via requests @@ -28,19 +28,19 @@ packaging==23.1 # via -r requirements/base.in pycparser==2.21 # via cffi -pygithub==1.58.1 +pygithub==1.59.0 # via -r requirements/base.in -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via pygithub pynacl==1.5.0 # via pygithub -requests==2.30.0 +requests==2.31.0 # via # -r requirements/base.in # pygithub smmap==5.0.0 # via gitdb -urllib3==2.0.2 +urllib3==2.0.4 # via requests wrapt==1.15.0 # via deprecated diff --git a/requirements/ci.txt b/requirements/ci.txt index bed1d014..b43d9e2b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,17 +4,17 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.12.0 +filelock==3.12.2 # via # tox # virtualenv packaging==23.1 # via tox -platformdirs==3.5.0 +platformdirs==3.10.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via tox py==1.11.0 # via tox @@ -29,5 +29,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -virtualenv==20.23.0 +virtualenv==20.24.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 28b024dd..565c8463 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==2.15.4 +astroid==2.15.6 # via # -r requirements/testing.txt # pylint @@ -13,7 +13,7 @@ build==0.10.0 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/testing.txt # requests @@ -22,11 +22,11 @@ cffi==1.15.1 # -r requirements/testing.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/testing.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/pip-tools.txt # -r requirements/testing.txt @@ -38,37 +38,37 @@ click-log==0.4.0 # via # -r requirements/testing.txt # edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/testing.txt # edx-lint -coverage[toml]==7.2.5 +coverage[toml]==7.2.7 # via # -r requirements/testing.txt # pytest-cov -cryptography==40.0.2 +cryptography==41.0.3 # via # -r requirements/testing.txt # pyjwt -deprecated==1.2.13 +deprecated==1.2.14 # via # -r requirements/testing.txt # pygithub -dill==0.3.6 +dill==0.3.7 # via # -r requirements/testing.txt # pylint -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv edx-lint==5.3.4 # via -r requirements/testing.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/testing.txt # pytest -filelock==3.12.0 +filelock==3.12.2 # via # -r requirements/ci.txt # tox @@ -77,7 +77,7 @@ gitdb==4.0.10 # via # -r requirements/testing.txt # gitpython -gitpython==3.1.31 +gitpython==3.1.32 # via -r requirements/testing.txt idna==3.4 # via @@ -99,7 +99,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/testing.txt # astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/testing.txt # jinja2 @@ -107,7 +107,7 @@ mccabe==0.7.0 # via # -r requirements/testing.txt # pylint -mock==5.0.2 +mock==5.1.0 # via -r requirements/testing.txt packaging==23.1 # via @@ -121,15 +121,15 @@ pbr==5.11.1 # via # -r requirements/testing.txt # stevedore -pip-tools==6.13.0 +pip-tools==7.1.0 # via -r requirements/pip-tools.txt -platformdirs==3.5.0 +platformdirs==3.10.0 # via # -r requirements/ci.txt # -r requirements/testing.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/ci.txt # -r requirements/testing.txt @@ -139,19 +139,19 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/testing.txt pycparser==2.21 # via # -r requirements/testing.txt # cffi -pygithub==1.58.1 +pygithub==1.59.0 # via -r requirements/testing.txt -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/testing.txt # pygithub -pylint==2.17.4 +pylint==2.17.5 # via # -r requirements/testing.txt # edx-lint @@ -166,7 +166,7 @@ pylint-django==2.5.3 # via # -r requirements/testing.txt # edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # -r requirements/testing.txt # pylint-celery @@ -179,21 +179,21 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/testing.txt # pytest-cov -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/testing.txt python-slugify==8.0.1 # via # -r requirements/testing.txt # code-annotations -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/testing.txt # code-annotations -requests==2.30.0 +requests==2.31.0 # via # -r requirements/testing.txt # pygithub @@ -207,7 +207,7 @@ smmap==5.0.0 # via # -r requirements/testing.txt # gitdb -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/testing.txt # code-annotations @@ -224,11 +224,12 @@ tomli==2.0.1 # -r requirements/testing.txt # build # coverage + # pip-tools # pylint # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/testing.txt # pylint @@ -239,20 +240,20 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.txt -typing-extensions==4.5.0 +typing-extensions==4.7.1 # via # -r requirements/testing.txt # astroid # pylint -urllib3==2.0.2 +urllib3==2.0.4 # via # -r requirements/testing.txt # requests -virtualenv==20.23.0 +virtualenv==20.24.2 # via # -r requirements/ci.txt # tox -wheel==0.40.0 +wheel==0.41.0 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fd0cc1c7..5748bf66 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,17 +6,20 @@ # build==0.10.0 # via pip-tools -click==8.1.3 +click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==6.13.0 +pip-tools==7.1.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build -wheel==0.40.0 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.41.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index e6827baa..fb1908e6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.2 +pip==23.2.1 # via -r requirements/pip.in -setuptools==67.7.2 +setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/testing.txt b/requirements/testing.txt index 0db19c72..4a61de1d 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,11 +4,11 @@ # # make upgrade # -astroid==2.15.4 +astroid==2.15.6 # via # pylint # pylint-celery -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -17,11 +17,11 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.6 # via # -r requirements/base.txt # click-log @@ -29,31 +29,31 @@ click==8.1.3 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via edx-lint -coverage[toml]==7.2.5 +coverage[toml]==7.2.7 # via # -r requirements/testing.in # pytest-cov -cryptography==40.0.2 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt -deprecated==1.2.13 +deprecated==1.2.14 # via # -r requirements/base.txt # pygithub -dill==0.3.6 +dill==0.3.7 # via pylint edx-lint==5.3.4 # via -r requirements/testing.in -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via pytest gitdb==4.0.10 # via # -r requirements/base.txt # gitpython -gitpython==3.1.31 +gitpython==3.1.32 # via -r requirements/base.txt idna==3.4 # via @@ -67,11 +67,11 @@ jinja2==3.1.2 # via code-annotations lazy-object-proxy==1.9.0 # via astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 mccabe==0.7.0 # via pylint -mock==5.0.2 +mock==5.1.0 # via -r requirements/testing.in packaging==23.1 # via @@ -79,23 +79,23 @@ packaging==23.1 # pytest pbr==5.11.1 # via stevedore -platformdirs==3.5.0 +platformdirs==3.10.0 # via pylint -pluggy==1.0.0 +pluggy==1.2.0 # via pytest -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/testing.in pycparser==2.21 # via # -r requirements/base.txt # cffi -pygithub==1.58.1 +pygithub==1.59.0 # via -r requirements/base.txt -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # pygithub -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -105,7 +105,7 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django @@ -113,17 +113,17 @@ pynacl==1.5.0 # via # -r requirements/base.txt # pygithub -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/testing.in # pytest-cov -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/testing.in python-slugify==8.0.1 # via code-annotations -pyyaml==6.0 +pyyaml==6.0.1 # via code-annotations -requests==2.30.0 +requests==2.31.0 # via # -r requirements/base.txt # pygithub @@ -133,7 +133,7 @@ smmap==5.0.0 # via # -r requirements/base.txt # gitdb -stevedore==5.0.0 +stevedore==5.1.0 # via code-annotations testfixtures==7.1.0 # via -r requirements/testing.in @@ -144,13 +144,13 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint -typing-extensions==4.5.0 +typing-extensions==4.7.1 # via # astroid # pylint -urllib3==2.0.2 +urllib3==2.0.4 # via # -r requirements/base.txt # requests