From bf0e5fcd1942c052ab1228e8f41ec863c8d8605d Mon Sep 17 00:00:00 2001 From: Ric Evans <19216225+ric-evans@users.noreply.github.com> Date: Tue, 5 Sep 2023 12:23:03 -0500 Subject: [PATCH] Require `urllib3>=2.0.4` (#137) Co-authored-by: github-actions --- dependencies-dev.log | 10 ++++++---- dependencies-mypy.log | 32 ++++++++++++++++++-------------- dependencies-telemetry.log | 26 +++++++++++++++----------- dependencies-tests.log | 10 ++++++---- dependencies.log | 4 +++- setup.cfg | 1 + setupenv.sh | 6 ------ 7 files changed, 49 insertions(+), 40 deletions(-) delete mode 100755 setupenv.sh diff --git a/dependencies-dev.log b/dependencies-dev.log index 0e86037a..c9e9bb2e 100644 --- a/dependencies-dev.log +++ b/dependencies-dev.log @@ -32,7 +32,7 @@ mypy-extensions==1.0.0 # via mypy packaging==23.1 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pycodestyle==2.11.0 # via flake8 @@ -44,7 +44,7 @@ pyjwt[crypto]==2.8.0 # via wipac-rest-tools (setup.py) pypng==0.20220715.0 # via qrcode -pytest==7.4.0 +pytest==7.4.1 # via # pytest-asyncio # pytest-mock @@ -65,7 +65,7 @@ requests-futures==1.0.1 # via wipac-rest-tools (setup.py) requests-mock==1.11.0 # via wipac-rest-tools (setup.py) -ruff==0.0.285 +ruff==0.0.287 # via wipac-rest-tools (setup.py) six==1.16.0 # via requests-mock @@ -81,7 +81,9 @@ typing-extensions==4.7.1 # qrcode # wipac-dev-tools urllib3==2.0.4 - # via requests + # via + # requests + # wipac-rest-tools (setup.py) wheel==0.41.2 # via wipac-rest-tools (setup.py) wipac-dev-tools==1.6.16 diff --git a/dependencies-mypy.log b/dependencies-mypy.log index 4a9aaa66..bf6f86d2 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -5,7 +5,9 @@ # pip-compile --extra=mypy --output-file=dependencies-mypy.log # backoff==2.2.1 - # via opentelemetry-exporter-otlp-proto-http + # via + # opentelemetry-exporter-otlp-proto-common + # opentelemetry-exporter-otlp-proto-http cachetools==5.3.1 # via wipac-rest-tools (setup.py) certifi==2023.7.22 @@ -66,38 +68,38 @@ mypy==1.5.1 # via wipac-rest-tools (setup.py) mypy-extensions==1.0.0 # via mypy -opentelemetry-api==1.19.0 +opentelemetry-api==1.20.0 # via # opentelemetry-exporter-jaeger-proto-grpc # opentelemetry-exporter-jaeger-thrift # opentelemetry-exporter-otlp-proto-http # opentelemetry-sdk # wipac-telemetry -opentelemetry-exporter-jaeger==1.19.0 +opentelemetry-exporter-jaeger==1.20.0 # via wipac-telemetry -opentelemetry-exporter-jaeger-proto-grpc==1.19.0 +opentelemetry-exporter-jaeger-proto-grpc==1.20.0 # via opentelemetry-exporter-jaeger -opentelemetry-exporter-jaeger-thrift==1.19.0 +opentelemetry-exporter-jaeger-thrift==1.20.0 # via opentelemetry-exporter-jaeger -opentelemetry-exporter-otlp-proto-common==1.19.0 +opentelemetry-exporter-otlp-proto-common==1.20.0 # via opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-http==1.19.0 +opentelemetry-exporter-otlp-proto-http==1.20.0 # via wipac-telemetry -opentelemetry-proto==1.19.0 +opentelemetry-proto==1.20.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.19.0 +opentelemetry-sdk==1.20.0 # via # opentelemetry-exporter-jaeger-proto-grpc # opentelemetry-exporter-jaeger-thrift # opentelemetry-exporter-otlp-proto-http # wipac-telemetry -opentelemetry-semantic-conventions==0.40b0 +opentelemetry-semantic-conventions==0.41b0 # via opentelemetry-sdk packaging==23.1 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest protobuf==3.20.3 # via @@ -116,7 +118,7 @@ pyjwt[crypto]==2.8.0 # via wipac-rest-tools (setup.py) pypng==0.20220715.0 # via qrcode -pytest==7.4.0 +pytest==7.4.1 # via # pycycle # pytest-asyncio @@ -142,7 +144,7 @@ requests-futures==1.0.1 # via wipac-rest-tools (setup.py) requests-mock==1.11.0 # via wipac-rest-tools (setup.py) -ruff==0.0.285 +ruff==0.0.287 # via wipac-rest-tools (setup.py) shellingham==1.5.3 # via click-completion @@ -167,7 +169,9 @@ typing-extensions==4.7.1 # wipac-dev-tools # wipac-telemetry urllib3==2.0.4 - # via requests + # via + # requests + # wipac-rest-tools (setup.py) wheel==0.41.2 # via wipac-rest-tools (setup.py) wipac-dev-tools==1.6.16 diff --git a/dependencies-telemetry.log b/dependencies-telemetry.log index 59038822..b7c4ecd4 100644 --- a/dependencies-telemetry.log +++ b/dependencies-telemetry.log @@ -5,7 +5,9 @@ # pip-compile --extra=telemetry --output-file=dependencies-telemetry.log # backoff==2.2.1 - # via opentelemetry-exporter-otlp-proto-http + # via + # opentelemetry-exporter-otlp-proto-common + # opentelemetry-exporter-otlp-proto-http cachetools==5.3.1 # via wipac-rest-tools (setup.py) certifi==2023.7.22 @@ -34,34 +36,34 @@ idna==3.4 # via requests importlib-metadata==6.8.0 # via opentelemetry-api -opentelemetry-api==1.19.0 +opentelemetry-api==1.20.0 # via # opentelemetry-exporter-jaeger-proto-grpc # opentelemetry-exporter-jaeger-thrift # opentelemetry-exporter-otlp-proto-http # opentelemetry-sdk # wipac-telemetry -opentelemetry-exporter-jaeger==1.19.0 +opentelemetry-exporter-jaeger==1.20.0 # via wipac-telemetry -opentelemetry-exporter-jaeger-proto-grpc==1.19.0 +opentelemetry-exporter-jaeger-proto-grpc==1.20.0 # via opentelemetry-exporter-jaeger -opentelemetry-exporter-jaeger-thrift==1.19.0 +opentelemetry-exporter-jaeger-thrift==1.20.0 # via opentelemetry-exporter-jaeger -opentelemetry-exporter-otlp-proto-common==1.19.0 +opentelemetry-exporter-otlp-proto-common==1.20.0 # via opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-http==1.19.0 +opentelemetry-exporter-otlp-proto-http==1.20.0 # via wipac-telemetry -opentelemetry-proto==1.19.0 +opentelemetry-proto==1.20.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.19.0 +opentelemetry-sdk==1.20.0 # via # opentelemetry-exporter-jaeger-proto-grpc # opentelemetry-exporter-jaeger-thrift # opentelemetry-exporter-otlp-proto-http # wipac-telemetry -opentelemetry-semantic-conventions==0.40b0 +opentelemetry-semantic-conventions==0.41b0 # via opentelemetry-sdk protobuf==3.20.3 # via @@ -97,7 +99,9 @@ typing-extensions==4.7.1 # wipac-dev-tools # wipac-telemetry urllib3==2.0.4 - # via requests + # via + # requests + # wipac-rest-tools (setup.py) wipac-dev-tools==1.6.16 # via # wipac-rest-tools (setup.py) diff --git a/dependencies-tests.log b/dependencies-tests.log index 945f7b61..759f0738 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -44,7 +44,7 @@ mccabe==0.7.0 # via flake8 packaging==23.1 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pycodestyle==2.11.0 # via flake8 @@ -58,7 +58,7 @@ pyjwt[crypto]==2.8.0 # via wipac-rest-tools (setup.py) pypng==0.20220715.0 # via qrcode -pytest==7.4.0 +pytest==7.4.1 # via # pycycle # pytest-asyncio @@ -83,7 +83,7 @@ requests-futures==1.0.1 # via wipac-rest-tools (setup.py) requests-mock==1.11.0 # via wipac-rest-tools (setup.py) -ruff==0.0.285 +ruff==0.0.287 # via wipac-rest-tools (setup.py) shellingham==1.5.3 # via click-completion @@ -102,6 +102,8 @@ typing-extensions==4.7.1 # qrcode # wipac-dev-tools urllib3==2.0.4 - # via requests + # via + # requests + # wipac-rest-tools (setup.py) wipac-dev-tools==1.6.16 # via wipac-rest-tools (setup.py) diff --git a/dependencies.log b/dependencies.log index 4bc7f297..c5417059 100644 --- a/dependencies.log +++ b/dependencies.log @@ -38,6 +38,8 @@ typing-extensions==4.7.1 # qrcode # wipac-dev-tools urllib3==2.0.4 - # via requests + # via + # requests + # wipac-rest-tools (setup.py) wipac-dev-tools==1.6.16 # via wipac-rest-tools (setup.py) diff --git a/setup.cfg b/setup.cfg index d2ac306a..9546d826 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,6 +55,7 @@ install_requires = requests requests-futures tornado + urllib3>=2.0.4 wipac-dev-tools python_requires = >=3.8, <3.12 packages = find: diff --git a/setupenv.sh b/setupenv.sh deleted file mode 100755 index fb6f80ca..00000000 --- a/setupenv.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -unset PYTHONPATH -python3 -m virtualenv -p python3 env -echo "unset PYTHONPATH" >> env/bin/activate -. env/bin/activate -pip install -e .[tests]