diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c4d97ab4..9f67dbc0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,12 +13,10 @@ repos: - id: mypy additional_dependencies: - --no-compile - - cffi==1.15.1 + - cffi==1.14.6 - cryptography==41.0.1 - pycparser==2.21 - types-pyopenssl==23.2.0.1 - types-pytz==2023.3.0.0 - types-pyyaml==6.0.12.10 - types-redis==4.6.0.0 - - types-requests==2.31.0.1 - - types-urllib3==1.26.25.13 diff --git a/VERSION b/VERSION index 5e3ec53e..db0785f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.2 +6.5.3 diff --git a/requirements.in b/requirements.in index 10c798eb..90712173 100644 --- a/requirements.in +++ b/requirements.in @@ -49,7 +49,7 @@ cryptography>2.3.0 # Upstream url: https://bitbucket.org/cffi/cffi # Use: Required by cryptography package to be installed. This should be removed # once crytography updates their depenencies to require cffi>=1.10.0. -cffi>1.10.0 +cffi>1.10.0,<1.15.0 # License: BSD # Upstream url: https://github.com/fengsp/flask-session @@ -89,7 +89,6 @@ python3-saml>=1.15.0 # Upstream url: http://python-requests.org # Use: REST calls to external services requests>=2.22.0,<3.0.0 -types-requests # Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL # License: BSD diff --git a/requirements.txt b/requirements.txt index 6345bff5..ee296dda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# cd ~/src/confidant-private/upstream && run-piptools +# cd ~/src/confidant && run-piptools # async-timeout==4.0.2 # via redis @@ -28,7 +28,7 @@ cerberus==1.3.4 # via -r requirements.in certifi==2023.5.7 # via requests -cffi==1.15.1 +cffi==1.14.6 # via # -r requirements.in # cryptography @@ -186,10 +186,6 @@ types-pyyaml==6.0.12.10 # via -r requirements.in types-redis==4.6.0.0 # via -r requirements.in -types-requests==2.31.0.1 - # via -r requirements.in -types-urllib3==1.26.25.13 - # via types-requests typing-extensions==4.7.0 # via mypy urllib3==1.25.11 diff --git a/requirements3.txt b/requirements3.txt index bbbddd58..ee296dda 100644 --- a/requirements3.txt +++ b/requirements3.txt @@ -28,7 +28,7 @@ cerberus==1.3.4 # via -r requirements.in certifi==2023.5.7 # via requests -cffi==1.15.1 +cffi==1.14.6 # via # -r requirements.in # cryptography @@ -186,10 +186,6 @@ types-pyyaml==6.0.12.10 # via -r requirements.in types-redis==4.6.0.0 # via -r requirements.in -types-requests==2.31.0.1 - # via -r requirements.in -types-urllib3==1.26.25.13 - # via types-requests typing-extensions==4.7.0 # via mypy urllib3==1.25.11 diff --git a/setup.cfg b/setup.cfg index 3556b7ab..172743b8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,3 +31,6 @@ ignore_errors = true ignore_errors = false disallow_untyped_defs = false disallow_incomplete_defs = false + +[mypy-requests.*] +ignore_missing_imports = true