From e6ed2a4dfb058d89c4f52a8d423c4946effe3216 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 5 Mar 2024 12:56:14 +0800 Subject: [PATCH 1/5] build(deps): re-generate requirements to support `Metadata-version=2.3` --- requirements/runtime-prerequisites.txt | 6 +-- requirements/runtime.txt | 72 ++++++++++---------------- 2 files changed, 30 insertions(+), 48 deletions(-) diff --git a/requirements/runtime-prerequisites.txt b/requirements/runtime-prerequisites.txt index ab411a2..02d411b 100644 --- a/requirements/runtime-prerequisites.txt +++ b/requirements/runtime-prerequisites.txt @@ -1,11 +1,11 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --output-file=requirements/runtime-prerequisites.txt --resolver=backtracking --strip-extras requirements/runtime-prerequisites.in +# pip-compile --allow-unsafe --output-file=requirements/runtime-prerequisites.txt --strip-extras requirements/runtime-prerequisites.in # pip-with-requires-python==1.0.1 - # via -r runtime-prerequisites.in + # via -r requirements/runtime-prerequisites.in # The following packages are considered to be unsafe in a requirements file: pip==23.3 diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 057fef3..dc5fe44 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,62 +1,50 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --output-file=requirements/runtime.txt --resolver=backtracking --strip-extras requirements/runtime.in +# pip-compile --allow-unsafe --output-file=requirements/runtime.txt --strip-extras requirements/runtime.in # -annotated-types==0.5.0 +annotated-types==0.6.0 # via pydantic -bleach==6.0.0 - # via readme-renderer -certifi==2023.7.22 +certifi==2024.2.2 # via requests -cffi==1.15.1 - # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -cryptography==42.0.4 - # via secretstorage docutils==0.20.1 # via readme-renderer -id==1.0.0 - # via -r runtime.in -idna==3.4 +id==1.3.0 + # via -r requirements/runtime.in +idna==3.6 # via requests -importlib-metadata==6.8.0 - # via - # keyring - # twine -jaraco-classes==3.3.0 +importlib-metadata==7.0.1 + # via twine +jaraco-classes==3.3.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage -keyring==24.2.0 +keyring==24.3.1 # via twine markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -more-itertools==9.1.0 +more-itertools==10.2.0 # via jaraco-classes -pkginfo==1.9.6 +nh3==0.2.15 + # via readme-renderer +pkginfo==1.10.0 # via twine -pycparser==2.21 - # via cffi -pydantic==2.0.2 +pydantic==2.6.3 # via id -pydantic-core==2.1.2 +pydantic-core==2.16.3 # via pydantic -pygments==2.15.1 +pygments==2.17.2 # via # readme-renderer # rich -readme-renderer==40.0 +readme-renderer==43.0 # via twine requests==2.31.0 # via - # -r runtime.in + # -r requirements/runtime.in # id # requests-toolbelt # twine @@ -64,23 +52,17 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.4.2 +rich==13.7.1 # via twine -secretstorage==3.3.3 - # via keyring -six==1.16.0 - # via bleach -twine==4.0.2 - # via -r runtime.in -typing-extensions==4.7.1 +twine==5.0.0 + # via -r requirements/runtime.in +typing-extensions==4.10.0 # via # pydantic # pydantic-core -urllib3==2.0.7 +urllib3==2.2.1 # via # requests # twine -webencodings==0.5.1 - # via bleach -zipp==3.16.0 +zipp==3.17.0 # via importlib-metadata From f6a1bcf88147c46b0897f811270ea8351c092936 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 5 Mar 2024 18:07:49 +0800 Subject: [PATCH 2/5] Revert "build(deps): re-generate requirements to support `Metadata-version=2.3`" This reverts commit e6ed2a4dfb058d89c4f52a8d423c4946effe3216. --- requirements/runtime-prerequisites.txt | 6 +-- requirements/runtime.txt | 72 ++++++++++++++++---------- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/requirements/runtime-prerequisites.txt b/requirements/runtime-prerequisites.txt index 02d411b..ab411a2 100644 --- a/requirements/runtime-prerequisites.txt +++ b/requirements/runtime-prerequisites.txt @@ -1,11 +1,11 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --output-file=requirements/runtime-prerequisites.txt --strip-extras requirements/runtime-prerequisites.in +# pip-compile --allow-unsafe --output-file=requirements/runtime-prerequisites.txt --resolver=backtracking --strip-extras requirements/runtime-prerequisites.in # pip-with-requires-python==1.0.1 - # via -r requirements/runtime-prerequisites.in + # via -r runtime-prerequisites.in # The following packages are considered to be unsafe in a requirements file: pip==23.3 diff --git a/requirements/runtime.txt b/requirements/runtime.txt index dc5fe44..057fef3 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,50 +1,62 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --output-file=requirements/runtime.txt --strip-extras requirements/runtime.in +# pip-compile --allow-unsafe --output-file=requirements/runtime.txt --resolver=backtracking --strip-extras requirements/runtime.in # -annotated-types==0.6.0 +annotated-types==0.5.0 # via pydantic -certifi==2024.2.2 +bleach==6.0.0 + # via readme-renderer +certifi==2023.7.22 # via requests -charset-normalizer==3.3.2 +cffi==1.15.1 + # via cryptography +charset-normalizer==3.2.0 # via requests +cryptography==42.0.4 + # via secretstorage docutils==0.20.1 # via readme-renderer -id==1.3.0 - # via -r requirements/runtime.in -idna==3.6 +id==1.0.0 + # via -r runtime.in +idna==3.4 # via requests -importlib-metadata==7.0.1 - # via twine -jaraco-classes==3.3.1 +importlib-metadata==6.8.0 + # via + # keyring + # twine +jaraco-classes==3.3.0 # via keyring -keyring==24.3.1 +jeepney==0.8.0 + # via + # keyring + # secretstorage +keyring==24.2.0 # via twine markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -more-itertools==10.2.0 +more-itertools==9.1.0 # via jaraco-classes -nh3==0.2.15 - # via readme-renderer -pkginfo==1.10.0 +pkginfo==1.9.6 # via twine -pydantic==2.6.3 +pycparser==2.21 + # via cffi +pydantic==2.0.2 # via id -pydantic-core==2.16.3 +pydantic-core==2.1.2 # via pydantic -pygments==2.17.2 +pygments==2.15.1 # via # readme-renderer # rich -readme-renderer==43.0 +readme-renderer==40.0 # via twine requests==2.31.0 # via - # -r requirements/runtime.in + # -r runtime.in # id # requests-toolbelt # twine @@ -52,17 +64,23 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.4.2 # via twine -twine==5.0.0 - # via -r requirements/runtime.in -typing-extensions==4.10.0 +secretstorage==3.3.3 + # via keyring +six==1.16.0 + # via bleach +twine==4.0.2 + # via -r runtime.in +typing-extensions==4.7.1 # via # pydantic # pydantic-core -urllib3==2.2.1 +urllib3==2.0.7 # via # requests # twine -zipp==3.17.0 +webencodings==0.5.1 + # via bleach +zipp==3.16.0 # via importlib-metadata From 2972d54cdab5f7cc1a4d00107865d78c61dc33a8 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 5 Mar 2024 18:16:00 +0800 Subject: [PATCH 3/5] bump pkginfo only --- requirements/runtime.txt | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 057fef3..4f24f82 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -10,16 +10,12 @@ bleach==6.0.0 # via readme-renderer certifi==2023.7.22 # via requests -cffi==1.15.1 - # via cryptography charset-normalizer==3.2.0 # via requests -cryptography==42.0.4 - # via secretstorage docutils==0.20.1 # via readme-renderer id==1.0.0 - # via -r runtime.in + # via -r requirements/runtime.in idna==3.4 # via requests importlib-metadata==6.8.0 @@ -28,10 +24,6 @@ importlib-metadata==6.8.0 # twine jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage keyring==24.2.0 # via twine markdown-it-py==3.0.0 @@ -40,10 +32,8 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==9.1.0 # via jaraco-classes -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine -pycparser==2.21 - # via cffi pydantic==2.0.2 # via id pydantic-core==2.1.2 @@ -56,7 +46,7 @@ readme-renderer==40.0 # via twine requests==2.31.0 # via - # -r runtime.in + # -r requirements/runtime.in # id # requests-toolbelt # twine @@ -66,12 +56,10 @@ rfc3986==2.0.0 # via twine rich==13.4.2 # via twine -secretstorage==3.3.3 - # via keyring six==1.16.0 # via bleach twine==4.0.2 - # via -r runtime.in + # via -r requirements/runtime.in typing-extensions==4.7.1 # via # pydantic From 00a7cd17a2c66f6633fffadcc81a15057686521a Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 6 Mar 2024 01:59:27 +0000 Subject: [PATCH 4/5] re-gen on Linux and run command in requirements/ --- requirements/runtime.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 4f24f82..d03c2cb 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -10,12 +10,16 @@ bleach==6.0.0 # via readme-renderer certifi==2023.7.22 # via requests +cffi==1.16.0 + # via cryptography charset-normalizer==3.2.0 # via requests +cryptography==42.0.5 + # via secretstorage docutils==0.20.1 # via readme-renderer id==1.0.0 - # via -r requirements/runtime.in + # via -r runtime.in idna==3.4 # via requests importlib-metadata==6.8.0 @@ -24,6 +28,10 @@ importlib-metadata==6.8.0 # twine jaraco-classes==3.3.0 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage keyring==24.2.0 # via twine markdown-it-py==3.0.0 @@ -34,6 +42,8 @@ more-itertools==9.1.0 # via jaraco-classes pkginfo==1.10.0 # via twine +pycparser==2.21 + # via cffi pydantic==2.0.2 # via id pydantic-core==2.1.2 @@ -46,7 +56,7 @@ readme-renderer==40.0 # via twine requests==2.31.0 # via - # -r requirements/runtime.in + # -r runtime.in # id # requests-toolbelt # twine @@ -56,10 +66,12 @@ rfc3986==2.0.0 # via twine rich==13.4.2 # via twine +secretstorage==3.3.3 + # via keyring six==1.16.0 # via bleach twine==4.0.2 - # via -r requirements/runtime.in + # via -r runtime.in typing-extensions==4.7.1 # via # pydantic From b065889f7f787ac4868821c2c78bc8f3590c1da7 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Wed, 6 Mar 2024 19:20:47 +0800 Subject: [PATCH 5/5] revert other bumps --- requirements/runtime.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index d03c2cb..4018038 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -10,11 +10,11 @@ bleach==6.0.0 # via readme-renderer certifi==2023.7.22 # via requests -cffi==1.16.0 +cffi==1.15.1 # via cryptography charset-normalizer==3.2.0 # via requests -cryptography==42.0.5 +cryptography==42.0.4 # via secretstorage docutils==0.20.1 # via readme-renderer