From b920ca794666a3d19d2f7ef15ea34f360c652d90 Mon Sep 17 00:00:00 2001 From: Leon Luttenberger <luttenberger.leon@gmail.com> Date: Wed, 12 Jun 2024 11:03:25 -0500 Subject: [PATCH 1/4] chore: add constraint to resolution of requirements-dev.txt --- requirements-dev.in | 2 +- requirements-dev.txt | 68 ++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index 0b577552..c5f7376e 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,4 +1,4 @@ -awscli~=1.31.13 +awscli~=1.33.4 certifi~=2024.6.2 check-manifest~=0.48 mypy~=1.10 diff --git a/requirements-dev.txt b/requirements-dev.txt index 6e26e1d9..2a56bbe2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,22 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --output-file=requirements-dev.txt requirements-dev.in +# pip-compile --constraint=requirements.txt --output-file=requirements-dev.txt requirements-dev.in # alabaster==0.7.13 # via sphinx astroid==2.15.8 # via sphinx-autoapi -awscli==1.31.13 +awscli==1.33.4 # via -r requirements-dev.in babel==2.14.0 # via sphinx bleach==6.0.0 # via readme-renderer -boto3==1.33.13 - # via moto -botocore==1.33.13 +boto3==1.34.122 + # via + # -c requirements.txt + # moto +botocore==1.34.122 # via + # -c requirements.txt # awscli # boto3 # moto @@ -29,24 +32,27 @@ build==1.2.1 # pyroma certifi==2024.6.2 # via + # -c requirements.txt # -r requirements-dev.in # requests cffi==1.15.1 # via cryptography charset-normalizer==3.3.2 - # via requests + # via + # -c requirements.txt + # requests check-manifest==0.49 # via -r requirements-dev.in click==8.1.7 - # via pip-tools + # via + # -c requirements.txt + # pip-tools colorama==0.4.4 # via awscli coverage[toml]==7.2.7 # via pytest-cov cryptography==42.0.4 - # via - # moto - # secretstorage + # via moto docutils==0.16 # via # awscli @@ -58,7 +64,9 @@ docutils==0.16 exceptiongroup==1.2.1 # via pytest idna==3.7 - # via requests + # via + # -c requirements.txt + # requests imagesize==1.4.1 # via sphinx importlib-metadata==7.1.0 @@ -71,18 +79,16 @@ iniconfig==2.0.0 # via pytest jaraco-classes==3.2.3 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage -jinja2==3.1.3 +jinja2==3.1.4 # via + # -c requirements.txt # moto # myst-parser # sphinx # sphinx-autoapi jmespath==1.0.1 # via + # -c requirements.txt # boto3 # botocore keyring==23.9.3 @@ -96,6 +102,7 @@ markdown-it-py==2.2.0 # rich markupsafe==2.1.5 # via + # -c requirements.txt # jinja2 # werkzeug mdit-py-plugins==0.3.5 @@ -109,11 +116,14 @@ moto[codebuild,iam,s3,secretsmanager,ssm,sts]==5.0.9 mypy==1.10.0 # via -r requirements-dev.in mypy-extensions==1.0.0 - # via mypy + # via + # -c requirements.txt + # mypy myst-parser==0.18.1 # via -r requirements-dev.in -packaging==23.2 +packaging==24.1 # via + # -c requirements.txt # build # pyroma # pytest @@ -132,8 +142,9 @@ pycparser==2.21 # via cffi pydot==2.0.0 # via -r requirements-dev.in -pygments==2.17.2 +pygments==2.18.0 # via + # -c requirements.txt # pyroma # readme-renderer # rich @@ -158,14 +169,16 @@ pytest-mock==3.14.0 # via -r requirements-dev.in pytest-ordering==0.6 # via -r requirements-dev.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via + # -c requirements.txt # botocore # moto pytz==2024.1 # via babel pyyaml==6.0.1 # via + # -c requirements.txt # awscli # moto # myst-parser @@ -175,6 +188,7 @@ readme-renderer==37.3 # via twine requests==2.32.3 # via + # -c requirements.txt # -r requirements-dev.in # moto # pyroma @@ -188,20 +202,22 @@ responses==0.23.3 # via moto rfc3986==2.0.0 # via twine -rich==13.7.0 - # via twine +rich==13.7.1 + # via + # -c requirements.txt + # twine rsa==4.7.2 # via awscli ruff==0.4.8 # via -r requirements-dev.in -s3transfer==0.8.2 +s3transfer==0.10.1 # via + # -c requirements.txt # awscli # boto3 -secretstorage==3.3.3 - # via keyring six==1.16.0 # via + # -c requirements.txt # bleach # python-dateutil snowballstemmer==2.2.0 @@ -252,6 +268,7 @@ types-setuptools==70.0.0.20240524 # via -r requirements-dev.in typing-extensions==4.12.2 # via + # -c requirements.txt # astroid # mypy # myst-parser @@ -260,6 +277,7 @@ unidecode==1.3.8 # via sphinx-autoapi urllib3==1.26.18 # via + # -c requirements.txt # -r requirements-dev.in # botocore # requests From dfef9015423d85b3aa3c7205afac7c6101c41977 Mon Sep 17 00:00:00 2001 From: Leon Luttenberger <luttenberger.leon@gmail.com> Date: Wed, 12 Jun 2024 11:07:29 -0500 Subject: [PATCH 2/4] update requirements-docs.txt --- docs/requirements-docs.txt | 45 +++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index d6456361..85871e1c 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile requirements-docs.in +# pip-compile --constraint=requirements.txt --output-file=docs/requirements-docs.txt docs/requirements-docs.in # alabaster==0.7.13 # via sphinx @@ -12,12 +12,17 @@ babel==2.12.1 # via sphinx certifi==2024.6.2 # via + # -c requirements.txt # -r docs/requirements-docs.in # requests -charset-normalizer==3.1.0 - # via requests +charset-normalizer==3.3.2 + # via + # -c requirements.txt + # requests click==8.1.7 - # via sphinx-click + # via + # -c requirements.txt + # sphinx-click docutils==0.18.1 # via # -r docs/requirements-docs.in @@ -26,13 +31,16 @@ docutils==0.18.1 # sphinx-click # sphinx-rtd-theme idna==3.7 - # via requests + # via + # -c requirements.txt + # requests imagesize==1.4.1 # via sphinx importlib-metadata==7.1.0 # via sphinx jinja2==3.1.4 # via + # -c requirements.txt # myst-parser # sphinx # sphinx-autoapi @@ -42,27 +50,36 @@ markdown-it-py==2.2.0 # via # mdit-py-plugins # myst-parser -markupsafe==2.1.2 - # via jinja2 +markupsafe==2.1.5 + # via + # -c requirements.txt + # jinja2 mdit-py-plugins==0.3.5 # via myst-parser mdurl==0.1.2 # via markdown-it-py myst-parser==1.0.0 # via -r docs/requirements-docs.in -packaging==23.1 - # via sphinx -pygments==2.15.1 - # via sphinx +packaging==24.1 + # via + # -c requirements.txt + # sphinx +pygments==2.18.0 + # via + # -c requirements.txt + # sphinx pytz==2024.1 # via babel pyyaml==6.0.1 # via + # -c requirements.txt # -r docs/requirements-docs.in # myst-parser # sphinx-autoapi requests==2.32.3 - # via sphinx + # via + # -c requirements.txt + # sphinx snowballstemmer==2.2.0 # via sphinx sphinx==5.3.0 @@ -108,12 +125,14 @@ sphinxcontrib-serializinghtml==1.1.5 # sphinx typing-extensions==4.12.2 # via + # -c requirements.txt # -r docs/requirements-docs.in # astroid unidecode==1.3.6 # via sphinx-autoapi urllib3==1.26.18 # via + # -c requirements.txt # -r docs/requirements-docs.in # requests wheel==0.43.0 From 8d06cc9bfa13cf733b5d0de9e2a1d74beb999942 Mon Sep 17 00:00:00 2001 From: Leon Luttenberger <luttenberger.leon@gmail.com> Date: Thu, 13 Jun 2024 12:23:02 -0500 Subject: [PATCH 3/4] Revert "update requirements-docs.txt" This reverts commit dfef9015423d85b3aa3c7205afac7c6101c41977. --- docs/requirements-docs.txt | 45 +++++++++++--------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 85871e1c..d6456361 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --constraint=requirements.txt --output-file=docs/requirements-docs.txt docs/requirements-docs.in +# pip-compile requirements-docs.in # alabaster==0.7.13 # via sphinx @@ -12,17 +12,12 @@ babel==2.12.1 # via sphinx certifi==2024.6.2 # via - # -c requirements.txt # -r docs/requirements-docs.in # requests -charset-normalizer==3.3.2 - # via - # -c requirements.txt - # requests +charset-normalizer==3.1.0 + # via requests click==8.1.7 - # via - # -c requirements.txt - # sphinx-click + # via sphinx-click docutils==0.18.1 # via # -r docs/requirements-docs.in @@ -31,16 +26,13 @@ docutils==0.18.1 # sphinx-click # sphinx-rtd-theme idna==3.7 - # via - # -c requirements.txt - # requests + # via requests imagesize==1.4.1 # via sphinx importlib-metadata==7.1.0 # via sphinx jinja2==3.1.4 # via - # -c requirements.txt # myst-parser # sphinx # sphinx-autoapi @@ -50,36 +42,27 @@ markdown-it-py==2.2.0 # via # mdit-py-plugins # myst-parser -markupsafe==2.1.5 - # via - # -c requirements.txt - # jinja2 +markupsafe==2.1.2 + # via jinja2 mdit-py-plugins==0.3.5 # via myst-parser mdurl==0.1.2 # via markdown-it-py myst-parser==1.0.0 # via -r docs/requirements-docs.in -packaging==24.1 - # via - # -c requirements.txt - # sphinx -pygments==2.18.0 - # via - # -c requirements.txt - # sphinx +packaging==23.1 + # via sphinx +pygments==2.15.1 + # via sphinx pytz==2024.1 # via babel pyyaml==6.0.1 # via - # -c requirements.txt # -r docs/requirements-docs.in # myst-parser # sphinx-autoapi requests==2.32.3 - # via - # -c requirements.txt - # sphinx + # via sphinx snowballstemmer==2.2.0 # via sphinx sphinx==5.3.0 @@ -125,14 +108,12 @@ sphinxcontrib-serializinghtml==1.1.5 # sphinx typing-extensions==4.12.2 # via - # -c requirements.txt # -r docs/requirements-docs.in # astroid unidecode==1.3.6 # via sphinx-autoapi urllib3==1.26.18 # via - # -c requirements.txt # -r docs/requirements-docs.in # requests wheel==0.43.0 From 5e7d73ebdebf17bad6ecbaac298c4e7424a8a1f6 Mon Sep 17 00:00:00 2001 From: Leon Luttenberger <luttenberger.leon@gmail.com> Date: Thu, 13 Jun 2024 12:26:26 -0500 Subject: [PATCH 4/4] remove sphinx and myst-parser dev deps --- requirements-dev.in | 4 --- requirements-dev.txt | 66 +------------------------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index c5f7376e..a61e5381 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -2,7 +2,6 @@ awscli~=1.33.4 certifi~=2024.6.2 check-manifest~=0.48 mypy~=1.10 -myst-parser~=0.18.0 pip-tools~=7.4.1 pydot~=2.0.0 pyroma~=4.0 @@ -15,9 +14,6 @@ twine~=5.1.0 types-PyYAML~=6.0.12 types-setuptools~=70.0.0 wheel~=0.43.0 -sphinx-autoapi~=1.8.0 -sphinx-rtd-theme~=1.3.0 -sphinx~=5.3.0 moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=5.0.9 requests~=2.32.3 werkzeug~=3.0.3 diff --git a/requirements-dev.txt b/requirements-dev.txt index 2a56bbe2..3a8d487a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,14 +4,8 @@ # # pip-compile --constraint=requirements.txt --output-file=requirements-dev.txt requirements-dev.in # -alabaster==0.7.13 - # via sphinx -astroid==2.15.8 - # via sphinx-autoapi awscli==1.33.4 # via -r requirements-dev.in -babel==2.14.0 - # via sphinx bleach==6.0.0 # via readme-renderer boto3==1.34.122 @@ -56,24 +50,18 @@ cryptography==42.0.4 docutils==0.16 # via # awscli - # myst-parser # pyroma # readme-renderer - # sphinx - # sphinx-rtd-theme exceptiongroup==1.2.1 # via pytest idna==3.7 # via # -c requirements.txt # requests -imagesize==1.4.1 - # via sphinx importlib-metadata==7.1.0 # via # build # keyring - # sphinx # twine iniconfig==2.0.0 # via pytest @@ -83,9 +71,6 @@ jinja2==3.1.4 # via # -c requirements.txt # moto - # myst-parser - # sphinx - # sphinx-autoapi jmespath==1.0.1 # via # -c requirements.txt @@ -93,20 +78,13 @@ jmespath==1.0.1 # botocore keyring==23.9.3 # via twine -lazy-object-proxy==1.9.0 - # via astroid markdown-it-py==2.2.0 - # via - # mdit-py-plugins - # myst-parser - # rich + # via rich markupsafe==2.1.5 # via # -c requirements.txt # jinja2 # werkzeug -mdit-py-plugins==0.3.5 - # via myst-parser mdurl==0.1.2 # via markdown-it-py more-itertools==9.1.0 @@ -119,15 +97,12 @@ mypy-extensions==1.0.0 # via # -c requirements.txt # mypy -myst-parser==0.18.1 - # via -r requirements-dev.in packaging==24.1 # via # -c requirements.txt # build # pyroma # pytest - # sphinx pip-tools==7.4.1 # via -r requirements-dev.in pkginfo==1.9.6 @@ -148,7 +123,6 @@ pygments==2.18.0 # pyroma # readme-renderer # rich - # sphinx pyparsing==3.1.1 # via pydot pyproject-hooks==1.0.0 @@ -174,16 +148,12 @@ python-dateutil==2.9.0.post0 # -c requirements.txt # botocore # moto -pytz==2024.1 - # via babel pyyaml==6.0.1 # via # -c requirements.txt # awscli # moto - # myst-parser # responses - # sphinx-autoapi readme-renderer==37.3 # via twine requests==2.32.3 @@ -194,7 +164,6 @@ requests==2.32.3 # pyroma # requests-toolbelt # responses - # sphinx # twine requests-toolbelt==1.0.0 # via twine @@ -220,33 +189,6 @@ six==1.16.0 # -c requirements.txt # bleach # python-dateutil -snowballstemmer==2.2.0 - # via sphinx -sphinx==5.3.0 - # via - # -r requirements-dev.in - # myst-parser - # sphinx-autoapi - # sphinx-rtd-theme - # sphinxcontrib-jquery -sphinx-autoapi==1.8.4 - # via -r requirements-dev.in -sphinx-rtd-theme==1.3.0 - # via -r requirements-dev.in -sphinxcontrib-applehelp==1.0.2 - # via sphinx -sphinxcontrib-devhelp==1.0.2 - # via sphinx -sphinxcontrib-htmlhelp==2.0.0 - # via sphinx -sphinxcontrib-jquery==4.1 - # via sphinx-rtd-theme -sphinxcontrib-jsmath==1.0.1 - # via sphinx -sphinxcontrib-qthelp==1.0.3 - # via sphinx -sphinxcontrib-serializinghtml==1.1.5 - # via sphinx tomli==2.0.1 # via # build @@ -269,12 +211,8 @@ types-setuptools==70.0.0.20240524 typing-extensions==4.12.2 # via # -c requirements.txt - # astroid # mypy - # myst-parser # rich -unidecode==1.3.8 - # via sphinx-autoapi urllib3==1.26.18 # via # -c requirements.txt @@ -293,8 +231,6 @@ wheel==0.43.0 # via # -r requirements-dev.in # pip-tools -wrapt==1.16.0 - # via astroid xmltodict==0.13.0 # via moto zipp==3.15.0