Skip to content

Commit

Permalink
Upgrade pip-tools to 6.5.1 and resolve incompatible requirements
Browse files Browse the repository at this point in the history
There was an issue with previous version of pip-tools that fails
to run pip-sync with pip >= 21.3

Refs: jazzband/pip-tools#1503
  • Loading branch information
mingfeng authored and mhieta committed Apr 12, 2022
1 parent 77cb35a commit 6f3340a
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 50 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pip-tools==6.1.0 # package management tool
pip-tools==6.5.1 # package management tool
pre-commit==2.12.1 # pre-commit hooks package manager
27 changes: 14 additions & 13 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
# pip-compile requirements-dev.in
#
backports.entry-points-selectable==1.1.0
# via virtualenv
cfgv==3.3.1
# via pre-commit
click==8.0.3
click==8.1.2
# via pip-tools
distlib==0.3.3
distlib==0.3.4
# via virtualenv
filelock==3.3.0
filelock==3.6.0
# via virtualenv
identify==2.3.0
identify==2.4.12
# via pre-commit
nodeenv==1.6.0
# via pre-commit
pep517==0.11.0
pep517==0.12.0
# via pip-tools
pip-tools==6.1.0
pip-tools==6.5.1
# via -r requirements-dev.in
platformdirs==2.4.0
platformdirs==2.5.1
# via virtualenv
pre-commit==2.12.1
# via -r requirements-dev.in
pyyaml==5.4.1
pyyaml==6.0
# via pre-commit
six==1.16.0
# via virtualenv
toml==0.10.2
# via pre-commit
tomli==1.2.1
tomli==2.0.1
# via pep517
virtualenv==20.8.1
virtualenv==20.14.0
# via pre-commit
wheel==0.37.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
52 changes: 25 additions & 27 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
# pip-compile requirements-test.in
#
appdirs==1.4.4
# via black
attrs==21.2.0
attrs==21.4.0
# via pytest
black==21.4b0
# via -r requirements-test.in
certifi==2021.10.8
# via requests
charset-normalizer==2.0.7
charset-normalizer==2.0.12
# via requests
click==8.0.3
click==8.1.2
# via black
coverage[toml]==6.0.2
coverage[toml]==6.3.2
# via pytest-cov
factory-boy==3.2.0
factory-boy==3.2.1
# via
# -r requirements-test.in
# pytest-factoryboy
faker==9.5.2
faker==13.3.4
# via factory-boy
flake8==3.9.1
# via -r requirements-test.in
freezegun==1.1.0
freezegun==1.2.1
# via -r requirements-test.in
idna==3.3
# via requests
Expand All @@ -40,53 +40,51 @@ mccabe==0.6.1
# via flake8
mypy-extensions==0.4.3
# via black
packaging==21.0
packaging==21.3
# via pytest
pathspec==0.9.0
# via black
pluggy==1.0.0
# via pytest
py==1.10.0
py==1.11.0
# via pytest
pycodestyle==2.7.0
# via flake8
pyflakes==2.3.1
# via flake8
pyparsing==2.4.7
pyparsing==3.0.7
# via packaging
pytest-cov==3.0.0
# via -r requirements-test.in
pytest-django==4.4.0
# via -r requirements-test.in
pytest-factoryboy==2.1.0
# via -r requirements-test.in
pytest==6.2.5
pytest==7.1.1
# via
# -r requirements-test.in
# pytest-cov
# pytest-django
# pytest-factoryboy
pytest-cov==3.0.0
# via -r requirements-test.in
pytest-django==4.5.2
# via -r requirements-test.in
pytest-factoryboy==2.1.0
# via -r requirements-test.in
python-dateutil==2.8.2
# via
# faker
# freezegun
regex==2021.10.21
regex==2022.3.15
# via black
requests==2.27.1
# via requests-mock
requests-mock==1.9.3
# via -r requirements-test.in
requests==2.26.0
# via requests-mock
six==1.16.0
# via
# python-dateutil
# requests-mock
text-unidecode==1.3
# via faker
toml==0.10.2
# via black
tomli==2.0.1
# via
# black
# coverage
# pytest
tomli==1.2.1
# via coverage
urllib3==1.26.7
urllib3==1.26.9
# via requests
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cachetools==5.0.0
# via django-helusers
certifi==2021.10.8
# via requests
charset-normalizer==2.0.11
charset-normalizer==2.0.12
# via requests
coreapi==2.3.3
# via drf-yasg
Expand Down Expand Up @@ -53,7 +53,7 @@ django-helusers==0.7.0
# via
# -r requirements.in
# helsinki-profile-gdpr-api
django-reversion==4.0.2
django-reversion==5.0.0
# via -r requirements.in
djangorestframework==3.12.4
# via
Expand Down Expand Up @@ -81,9 +81,9 @@ inflection==0.5.1
# via drf-yasg
itypes==1.2.0
# via coreapi
jinja2==3.0.3
jinja2==3.1.1
# via coreschema
markupsafe==2.0.1
markupsafe==2.1.1
# via jinja2
packaging==21.3
# via
Expand All @@ -95,7 +95,7 @@ pyasn1==0.4.8
# via
# python-jose
# rsa
pycryptodomex==3.14.0
pycryptodomex==3.14.1
# via pyjwkest
pyjwkest==1.4.2
# via drf-oidc-auth
Expand All @@ -105,7 +105,7 @@ python-dateutil==2.8.2
# via arrow
python-jose==3.3.0
# via django-helusers
pytz==2021.3
pytz==2022.1
# via django
requests==2.27.1
# via
Expand All @@ -115,7 +115,7 @@ requests==2.27.1
# pyjwkest
rsa==4.8
# via python-jose
ruamel-yaml==0.17.20
ruamel-yaml==0.17.21
# via drf-yasg
ruamel-yaml-clib==0.2.6
# via ruamel-yaml
Expand All @@ -129,13 +129,13 @@ sqlparse==0.4.2
# via django
starlette==0.14.2
# via ariadne
typing-extensions==4.0.1
typing-extensions==4.1.1
# via ariadne
uritemplate==4.1.1
# via
# coreapi
# drf-yasg
urllib3==1.26.8
urllib3==1.26.9
# via requests
whitenoise==5.2.0
# via -r requirements.in
Expand Down

0 comments on commit 6f3340a

Please sign in to comment.