From c20b2749b3f7967b54d56a1657ee5c7d5a5d9fcd Mon Sep 17 00:00:00 2001 From: Lance Austin Date: Wed, 2 Aug 2023 22:05:20 -0500 Subject: [PATCH] deps(python): update multiple dependabot commits This consolidates multiple python dependency upgrades. Signed-off-by: Lance Austin --- DEPENDENCIES.md | 90 ++++++++++++++--------------- docker/test-shadow/requirements.txt | 6 +- docker/test-stats/requirements.txt | 2 +- python/requirements-dev.txt | 2 +- python/requirements.txt | 26 +++++---- tools/src/py-mkopensource/main.go | 5 +- 6 files changed, 67 insertions(+), 64 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index a039426911..e014b45d46 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -151,48 +151,48 @@ following Free and Open Source software: The Emissary-ingress Python code makes use of the following Free and Open Source libraries: - Name Version License(s) - ---- ------- ---------- - Cython 0.29.36 Apache License 2.0 - Flask 2.3.2 3-clause BSD license - Jinja2 3.1.2 3-clause BSD license - MarkupSafe 2.1.3 3-clause BSD license - PyYAML 6.0.1 MIT license - Werkzeug 2.3.6 3-clause BSD license - blinker 1.6.2 MIT license - build 0.9.0 MIT license - cachetools 5.3.0 MIT license - certifi 2023.5.7 Mozilla Public License 2.0 - charset-normalizer 3.1.0 MIT license - click 8.1.3 3-clause BSD license - dpath 2.1.4 MIT license - durationpy 0.5 MIT license - expiringdict 1.2.2 Apache License 2.0 - google-auth 2.16.1 Apache License 2.0 - gunicorn 20.1.0 MIT license - idna 3.4 3-clause BSD license - itsdangerous 2.1.2 3-clause BSD license - jsonpatch 1.33 3-clause BSD license - jsonpointer 2.3 3-clause BSD license - kubernetes 26.1.0 Apache License 2.0 - oauthlib 3.2.2 3-clause BSD license - orjson 3.9.1 Apache License 2.0, MIT license - packaging 21.3 2-clause BSD license, Apache License 2.0 - pep517 0.13.0 MIT license - pip-tools 6.12.1 3-clause BSD license - prometheus-client 0.15.0 Apache License 2.0 - pyasn1 0.4.8 2-clause BSD license - pyasn1-modules 0.2.8 2-clause BSD license - pyparsing 3.0.9 MIT license - python-dateutil 2.8.2 3-clause BSD license, Apache License 2.0 - python-json-logger 2.0.7 2-clause BSD license - requests 2.31.0 Apache License 2.0 - requests-oauthlib 1.3.1 ISC license - retrying 1.3.3 Apache License 2.0 - rsa 4.9 Apache License 2.0 - semantic-version 2.10.0 2-clause BSD license - six 1.16.0 MIT license - tomli 2.0.1 MIT license - typing_extensions 4.7.1 Python Software Foundation license - urllib3 1.26.13 MIT license - websocket-client 1.4.2 Apache License 2.0 + Name Version License(s) + ---- ------- ---------- + Cython 0.29.36 Apache License 2.0 + Flask 2.3.2 3-clause BSD license + Jinja2 3.1.2 3-clause BSD license + MarkupSafe 2.1.3 3-clause BSD license + PyYAML 6.0.1 MIT license + Werkzeug 2.3.6 3-clause BSD license + blinker 1.6.2 MIT license + build 0.9.0 MIT license + cachetools 5.3.1 MIT license + certifi 2023.7.22 Mozilla Public License 2.0 + charset-normalizer 3.1.0 MIT license + click 8.1.3 3-clause BSD license + dpath 2.1.6 MIT license + durationpy 0.5 MIT license + expiringdict 1.2.2 Apache License 2.0 + google-auth 2.22.0 Apache License 2.0 + gunicorn 20.1.0 MIT license + idna 3.4 3-clause BSD license + itsdangerous 2.1.2 3-clause BSD license + jsonpatch 1.33 3-clause BSD license + jsonpointer 2.4 3-clause BSD license + kubernetes 27.2.0 Apache License 2.0 + oauthlib 3.2.2 3-clause BSD license + orjson 3.9.1 Apache License 2.0, MIT license + packaging 21.3 2-clause BSD license, Apache License 2.0 + pep517 0.13.0 MIT license + pip-tools 6.12.1 3-clause BSD license + prometheus-client 0.17.1 Apache License 2.0 + pyasn1 0.5.0 2-clause BSD license + pyasn1-modules 0.3.0 2-clause BSD license + pyparsing 3.0.9 MIT license + python-dateutil 2.8.2 3-clause BSD license, Apache License 2.0 + python-json-logger 2.0.7 2-clause BSD license + requests 2.31.0 Apache License 2.0 + requests-oauthlib 1.3.1 ISC license + retrying 1.3.3 Apache License 2.0 + rsa 4.9 Apache License 2.0 + semantic-version 2.10.0 2-clause BSD license + six 1.16.0 MIT license + tomli 2.0.1 MIT license + typing_extensions 4.7.1 Python Software Foundation license + urllib3 1.26.13 MIT license + websocket-client 1.6.1 Apache License 2.0 diff --git a/docker/test-shadow/requirements.txt b/docker/test-shadow/requirements.txt index 194f7a6db4..d8a55239ce 100644 --- a/docker/test-shadow/requirements.txt +++ b/docker/test-shadow/requirements.txt @@ -1,9 +1,9 @@ -click==8.1.3 # via flask +click==8.1.6 # via flask flask==2.3.2 -importlib-metadata==6.7.0 # via click +importlib-metadata==6.8.0 # via click itsdangerous==2.1.2 # via flask jinja2==3.1.2 # via flask markupsafe==2.1.3 # via jinja2 typing-extensions==4.7.1 # via importlib-metadata werkzeug==2.3.6 # via flask -zipp==3.15.0 # via importlib-metadata +zipp==3.16.2 # via importlib-metadata diff --git a/docker/test-stats/requirements.txt b/docker/test-stats/requirements.txt index 49720a4a62..2ae463a331 100644 --- a/docker/test-stats/requirements.txt +++ b/docker/test-stats/requirements.txt @@ -1,4 +1,4 @@ -click==8.1.3 # via flask +click==8.1.6 # via flask flask==2.3.2 itsdangerous==2.1.2 # via flask jinja2==3.1.2 # via flask diff --git a/python/requirements-dev.txt b/python/requirements-dev.txt index 338323632e..66e09bf382 100644 --- a/python/requirements-dev.txt +++ b/python/requirements-dev.txt @@ -9,7 +9,7 @@ pytest==6.2.5 pytest-cov pytest-rerunfailures retry -black==23.3 +black==23.7 isort # Type stubs diff --git a/python/requirements.txt b/python/requirements.txt index 35a8331d9b..50f6e876af 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -6,9 +6,9 @@ # blinker==1.6.2 # via flask -cachetools==5.3.0 +cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # kubernetes # requests @@ -18,7 +18,7 @@ click==8.1.3 # via # -r requirements.in # flask -dpath==2.1.4 +dpath==2.1.6 # via -r requirements.in durationpy==0.5 # via -r requirements.in @@ -26,7 +26,7 @@ expiringdict==1.2.2 # via -r requirements.in flask==2.3.2 # via -r requirements.in -google-auth==2.16.1 +google-auth==2.22.0 # via kubernetes gunicorn==20.1.0 # via -r requirements.in @@ -38,25 +38,27 @@ jinja2==3.1.2 # via flask jsonpatch==1.33 # via -r requirements.in -jsonpointer==2.3 +jsonpointer==2.4 # via jsonpatch -kubernetes==26.1.0 +kubernetes==27.2.0 # via -r requirements.in markupsafe==2.1.3 # via # jinja2 # werkzeug oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib orjson==3.9.1 # via -r requirements.in -prometheus-client==0.15.0 +prometheus-client==0.17.1 # via -r requirements.in -pyasn1==0.4.8 +pyasn1==0.5.0 # via # pyasn1-modules # rsa -pyasn1-modules==0.2.8 +pyasn1-modules==0.3.0 # via google-auth python-dateutil==2.8.2 # via kubernetes @@ -81,7 +83,6 @@ setuptools==68.0.0 # via # -r requirements.in # gunicorn - # kubernetes six==1.16.0 # via # google-auth @@ -91,9 +92,10 @@ typing-extensions==4.7.1 # via -r requirements.in urllib3==1.26.13 # via + # google-auth # kubernetes # requests -websocket-client==1.4.2 +websocket-client==1.6.1 # via kubernetes werkzeug==2.3.6 # via flask diff --git a/tools/src/py-mkopensource/main.go b/tools/src/py-mkopensource/main.go index 7e4d7b336d..bd67278c68 100644 --- a/tools/src/py-mkopensource/main.go +++ b/tools/src/py-mkopensource/main.go @@ -48,7 +48,7 @@ func parseLicenses(name, version, license string) map[License]struct{} { {"importlib-resources", "5.4.0", "UNKNOWN"}: {Apache2}, {"itsdangerous", "1.1.0", "BSD"}: {BSD3}, {"jsonpatch", "1.33", "Modified BSD License"}: {BSD3}, - {"jsonpointer", "2.3", "Modified BSD License"}: {BSD3}, + {"jsonpointer", "2.4", "Modified BSD License"}: {BSD3}, {"jsonschema", "3.2.0", "UNKNOWN"}: {MIT}, {"lockfile", "0.12.2", "UNKNOWN"}: {MIT}, {"oauthlib", "3.1.0", "BSD"}: {BSD3}, @@ -56,7 +56,8 @@ func parseLicenses(name, version, license string) map[License]struct{} { {"pep517", "0.13.0", ""}: {MIT}, {"pip-tools", "6.12.1", "BSD"}: {BSD3}, {"ptyprocess", "0.6.0", "UNKNOWN"}: {ISC}, - {"pyasn1", "0.4.8", "BSD"}: {BSD2}, + {"pyasn1", "0.5.0", "BSD"}: {BSD2}, + {"pyasn1-modules", "0.3.0", "BSD"}: {BSD2}, {"pycparser", "2.20", "BSD"}: {BSD3}, {"pyparsing", "3.0.9", ""}: {MIT}, {"python-dateutil", "2.8.1", "Dual License"}: {BSD3, Apache2},