From 56ec964c169e0a4c01959f9fc54b4c94041d7839 Mon Sep 17 00:00:00 2001 From: Qiao Qiao <68757394+qiaouchicago@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:28:17 -0500 Subject: [PATCH] DEV-2705 poam update deps (#111) * update deps * update tox.ini * solve comments * recompile deps with --index-url --- .gitlab-ci.yml | 2 +- requirements.txt | 27 ++++++++++++++------------- setup.py | 5 +++-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79962e2b..c687b7e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ pre-commit: tox: parallel: matrix: - - BUILD_PY_VERSION: [python3.7, python3.8, python3.9, python3.10, python3.11] + - BUILD_PY_VERSION: [python3.7, python3.8, python3.9, python3.10] services: - name: docker.osdc.io/ncigdc/ci-postgres-13:${BASE_CONTAINER_VERSION} alias: postgres diff --git a/requirements.txt b/requirements.txt index e98b3cff..884fa844 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,27 +17,27 @@ cattrs==23.1.2 # via ddtrace cdislogging==1.1.1 # via indexd (setup.py) -certifi==2023.11.17 +certifi==2024.2.2 # via requests charset-normalizer==3.3.2 # via requests click==8.1.7 # via flask -ddsketch==2.0.4 +ddsketch==3.0.1 # via ddtrace -ddtrace==2.4.0 +ddtrace==2.8.4 # via indexd (setup.py) deprecated==1.2.14 # via opentelemetry-api -envier==0.5.0 +envier==0.5.1 # via ddtrace -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via cattrs flask==2.2.5 # via indexd (setup.py) -idna==3.6 +idna==3.7 # via requests -importlib-metadata==6.7.0 ; python_version < "3.8" +importlib-metadata==6.5.0 ; python_version < "3.8" # via # attrs # click @@ -51,11 +51,11 @@ importlib-resources==5.12.0 # via jsonschema itsdangerous==2.1.2 # via flask -jinja2==3.1.2 +jinja2==3.1.4 # via flask jsonschema==4.17.3 # via indexd (setup.py) -markupsafe==2.1.3 +markupsafe==2.1.5 # via # jinja2 # werkzeug @@ -64,9 +64,7 @@ opentelemetry-api==1.22.0 pkgutil-resolve-name==1.3.10 # via jsonschema protobuf==4.24.4 - # via - # ddsketch - # ddtrace + # via ddtrace psycopg2==2.9.9 # via indexd (setup.py) pyrsistent==0.19.3 @@ -81,13 +79,16 @@ sqlalchemy==1.3.24 # via # indexd (setup.py) # sqlalchemy-utils -sqlalchemy-utils==0.41.1 +sqlalchemy-utils==0.41.2 # via indexd (setup.py) +sqlparse==0.4.4 + # via ddtrace typing-extensions==4.5.0 # via # cattrs # ddtrace # importlib-metadata + # indexd (setup.py) # jsonschema urllib3==2.0.7 # via requests diff --git a/setup.py b/setup.py index 059b5b67..03f80e13 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,6 @@ "pytest-flask", "PyYAML", "openapi-spec-validator", - # jsonschema-spec 0.1.6 depends on typing-extensions<4.6.0 "jsonschema-spec>=0.1.6", # used by openapi-spec-validator and have bug in 0.1.4 ], }, @@ -49,6 +48,8 @@ "cdislogging>=1.0", "requests", "ddtrace", - "importlib-metadata; python_version < '3.8'", + "importlib-metadata>=1.4; python_version < '3.8'", + # jsonschema-spec 0.1.6 depends on typing-extensions<4.6.0 + "typing-extensions<4.6.0", ], )