From db77581f35af5b4f70e671966b23e3fa49b16d4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:29:54 +0000 Subject: [PATCH 1/2] Bump the production-dependencies group across 1 directory with 22 updates Bumps the production-dependencies group with 22 updates in the / directory: | Package | From | To | | --- | --- | --- | | [annotated-types](https://github.com/annotated-types/annotated-types) | `0.5.0` | `0.7.0` | | [arrow](https://github.com/arrow-py/arrow) | `1.2.3` | `1.3.0` | | [boto3](https://github.com/boto/boto3) | `1.33.13` | `1.34.120` | | [botocore](https://github.com/boto/botocore) | `1.33.13` | `1.34.120` | | [certifi](https://github.com/certifi/python-certifi) | `2023.7.22` | `2024.6.2` | | [cookiecutter](https://github.com/cookiecutter/cookiecutter) | `2.1.1` | `2.6.0` | | [gitpython](https://github.com/gitpython-developers/GitPython) | `3.1.42` | `3.1.43` | | [packaging](https://github.com/pypa/packaging) | `23.2` | `24.0` | | [pydantic](https://github.com/pydantic/pydantic) | `2.5.3` | `2.7.3` | | [pydantic-core](https://github.com/pydantic/pydantic-core) | `2.14.6` | `2.18.4` | | [pygments](https://github.com/pygments/pygments) | `2.17.2` | `2.18.0` | | [pyhumps](https://github.com/nficano/humps) | `3.5.3` | `3.8.0` | | [python-dateutil](https://github.com/dateutil/dateutil) | `2.8.2` | `2.9.0.post0` | | [python-dotenv](https://github.com/theskumar/python-dotenv) | `0.21.1` | `1.0.1` | | [pyyaml](https://github.com/yaml/pyyaml) | `5.4` | `6.0.1` | | [requests](https://github.com/psf/requests) | `2.32.0` | `2.32.3` | | [rich](https://github.com/Textualize/rich) | `12.4.4` | `13.7.1` | | [s3transfer](https://github.com/boto/s3transfer) | `0.8.2` | `0.10.1` | | [typing-extensions](https://github.com/python/typing_extensions) | `4.5.0` | `4.12.1` | | [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) | `1.2.1` | `1.3.0` | | [wheel](https://github.com/pypa/wheel) | `0.38.1` | `0.43.0` | | [sphinx-click](https://github.com/click-contrib/sphinx-click) | `5.1.0` | `6.0.0` | Updates `annotated-types` from 0.5.0 to 0.7.0 - [Release notes](https://github.com/annotated-types/annotated-types/releases) - [Commits](https://github.com/annotated-types/annotated-types/compare/v0.5.0...v0.7.0) Updates `arrow` from 1.2.3 to 1.3.0 - [Release notes](https://github.com/arrow-py/arrow/releases) - [Changelog](https://github.com/arrow-py/arrow/blob/master/CHANGELOG.rst) - [Commits](https://github.com/arrow-py/arrow/compare/1.2.3...1.3.0) Updates `boto3` from 1.33.13 to 1.34.120 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.33.13...1.34.120) Updates `botocore` from 1.33.13 to 1.34.120 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.33.13...1.34.120) Updates `certifi` from 2023.7.22 to 2024.6.2 - [Commits](https://github.com/certifi/python-certifi/compare/2023.07.22...2024.06.02) Updates `cookiecutter` from 2.1.1 to 2.6.0 - [Release notes](https://github.com/cookiecutter/cookiecutter/releases) - [Changelog](https://github.com/cookiecutter/cookiecutter/blob/main/HISTORY.md) - [Commits](https://github.com/cookiecutter/cookiecutter/compare/2.1.1...2.6.0) Updates `gitpython` from 3.1.42 to 3.1.43 - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.42...3.1.43) Updates `packaging` from 23.2 to 24.0 - [Release notes](https://github.com/pypa/packaging/releases) - [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pypa/packaging/compare/23.2...24.0) Updates `pydantic` from 2.5.3 to 2.7.3 - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.5.3...v2.7.3) Updates `pydantic-core` from 2.14.6 to 2.18.4 - [Release notes](https://github.com/pydantic/pydantic-core/releases) - [Commits](https://github.com/pydantic/pydantic-core/compare/v2.14.6...v2.18.4) Updates `pygments` from 2.17.2 to 2.18.0 - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.17.2...2.18.0) Updates `pyhumps` from 3.5.3 to 3.8.0 - [Commits](https://github.com/nficano/humps/compare/v3.5.3...v3.8.0) Updates `python-dateutil` from 2.8.2 to 2.9.0.post0 - [Release notes](https://github.com/dateutil/dateutil/releases) - [Changelog](https://github.com/dateutil/dateutil/blob/master/NEWS) - [Commits](https://github.com/dateutil/dateutil/compare/2.8.2...2.9.0.post0) Updates `python-dotenv` from 0.21.1 to 1.0.1 - [Release notes](https://github.com/theskumar/python-dotenv/releases) - [Changelog](https://github.com/theskumar/python-dotenv/blob/main/CHANGELOG.md) - [Commits](https://github.com/theskumar/python-dotenv/compare/v0.21.1...v1.0.1) Updates `pyyaml` from 5.4 to 6.0.1 - [Changelog](https://github.com/yaml/pyyaml/blob/main/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/5.4...6.0.1) Updates `requests` from 2.32.0 to 2.32.3 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.32.0...v2.32.3) Updates `rich` from 12.4.4 to 13.7.1 - [Release notes](https://github.com/Textualize/rich/releases) - [Changelog](https://github.com/Textualize/rich/blob/master/CHANGELOG.md) - [Commits](https://github.com/Textualize/rich/compare/v12.4.4...v13.7.1) Updates `s3transfer` from 0.8.2 to 0.10.1 - [Changelog](https://github.com/boto/s3transfer/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/s3transfer/compare/0.8.2...0.10.1) Updates `typing-extensions` from 4.5.0 to 4.12.1 - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.5.0...4.12.1) Updates `sphinx-rtd-theme` from 1.2.1 to 1.3.0 - [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst) - [Commits](https://github.com/readthedocs/sphinx_rtd_theme/compare/1.2.1...1.3.0) Updates `wheel` from 0.38.1 to 0.43.0 - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.38.1...0.43.0) Updates `sphinx-click` from 5.1.0 to 6.0.0 - [Release notes](https://github.com/click-contrib/sphinx-click/releases) - [Commits](https://github.com/click-contrib/sphinx-click/compare/5.1.0...6.0.0) --- updated-dependencies: - dependency-name: annotated-types dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: arrow dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: certifi dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: cookiecutter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: gitpython dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: packaging dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pydantic-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pygments dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pyhumps dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: python-dateutil dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: python-dotenv dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: rich dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: s3transfer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: typing-extensions dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: sphinx-rtd-theme dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: wheel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: sphinx-click dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] --- docs/requirements-docs.in | 12 ++++++------ docs/requirements-docs.txt | 24 ++++++++++++++++-------- requirements-dev.in | 8 ++++---- requirements-dev.txt | 23 +++++++++++++++++------ requirements.txt | 36 ++++++++++++++++++------------------ setup.py | 14 +++++++------- 6 files changed, 68 insertions(+), 49 deletions(-) diff --git a/docs/requirements-docs.in b/docs/requirements-docs.in index 5de9c165..df84110a 100644 --- a/docs/requirements-docs.in +++ b/docs/requirements-docs.in @@ -1,5 +1,5 @@ sphinx-autoapi==2.1.0 -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.3.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1 @@ -7,11 +7,11 @@ sphinxcontrib-jquery==4.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sphinx-click==5.1.0 +sphinx-click==6.0.0 myst_parser==1.0.0 docutils~=0.16 -PyYAML==5.4 +PyYAML==6.0.1 urllib3~=1.26.18 -wheel==0.38.1 -typing-extensions==4.5.0 -certifi~=2023.7.22 +wheel==0.43.0 +typing-extensions==4.12.1 +certifi~=2024.6.2 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 6af16f70..313cdc29 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -10,7 +10,7 @@ astroid==2.15.5 # via sphinx-autoapi babel==2.12.1 # via sphinx -certifi==2023.7.22 +certifi==2024.6.2 # via # -r docs/requirements-docs.in # requests @@ -29,6 +29,8 @@ idna==3.7 # via requests imagesize==1.4.1 # via sphinx +importlib-metadata==7.1.0 + # via sphinx jinja2==3.1.4 # via # myst-parser @@ -52,12 +54,14 @@ packaging==23.1 # via sphinx pygments==2.15.1 # via sphinx -pyyaml==5.4 +pytz==2024.1 + # via babel +pyyaml==6.0.1 # via # -r docs/requirements-docs.in # myst-parser # sphinx-autoapi -requests==2.32.0 +requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx @@ -70,9 +74,9 @@ sphinx==6.2.1 # sphinxcontrib-jquery sphinx-autoapi==2.1.0 # via -r docs/requirements-docs.in -sphinx-click==5.1.0 +sphinx-click==6.0.0 # via -r docs/requirements-docs.in -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.3.0 # via -r docs/requirements-docs.in sphinxcontrib-applehelp==1.0.4 # via @@ -102,15 +106,19 @@ sphinxcontrib-serializinghtml==1.1.5 # via # -r docs/requirements-docs.in # sphinx -typing-extensions==4.5.0 - # via -r docs/requirements-docs.in +typing-extensions==4.12.1 + # via + # -r docs/requirements-docs.in + # astroid unidecode==1.3.6 # via sphinx-autoapi urllib3==1.26.18 # via # -r docs/requirements-docs.in # requests -wheel==0.38.1 +wheel==0.43.0 # via -r docs/requirements-docs.in wrapt==1.15.0 # via astroid +zipp==3.19.2 + # via importlib-metadata diff --git a/requirements-dev.in b/requirements-dev.in index c48f975f..da714930 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,5 +1,5 @@ awscli~=1.31.13 -certifi~=2023.7.22 +certifi~=2024.6.2 check-manifest~=0.48 mypy~=1.10 myst-parser~=0.18.0 @@ -14,11 +14,11 @@ ruff~=0.4.8 twine~=5.1.0 types-PyYAML~=6.0.12 types-setuptools~=70.0.0 -wheel~=0.38.1 +wheel~=0.43.0 sphinx-autoapi~=1.8.0 -sphinx-rtd-theme~=1.0.0 +sphinx-rtd-theme~=1.3.0 sphinx~=4.3.0 moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=5.0.9 -requests~=2.32.0 +requests~=2.32.3 werkzeug~=3.0.3 urllib3~=1.26.18 \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index 60551c31..cd032220 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -27,7 +27,7 @@ build==1.2.1 # check-manifest # pip-tools # pyroma -certifi==2023.7.22 +certifi==2024.6.2 # via # -r requirements-dev.in # requests @@ -44,7 +44,9 @@ colorama==0.4.4 coverage[toml]==7.2.7 # via pytest-cov cryptography==42.0.4 - # via moto + # via + # moto + # secretstorage docutils==0.16 # via # awscli @@ -68,6 +70,10 @@ iniconfig==2.0.0 # via pytest jaraco-classes==3.2.3 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage jinja2==3.1.3 # via # moto @@ -166,7 +172,7 @@ pyyaml==6.0.1 # sphinx-autoapi readme-renderer==37.3 # via twine -requests==2.32.0 +requests==2.32.3 # via # -r requirements-dev.in # moto @@ -191,6 +197,8 @@ s3transfer==0.8.2 # via # awscli # boto3 +secretstorage==3.3.3 + # via keyring six==1.16.0 # via # bleach @@ -203,9 +211,10 @@ sphinx==4.3.2 # myst-parser # sphinx-autoapi # sphinx-rtd-theme + # sphinxcontrib-jquery sphinx-autoapi==1.8.4 # via -r requirements-dev.in -sphinx-rtd-theme==1.0.0 +sphinx-rtd-theme==1.3.0 # via -r requirements-dev.in sphinxcontrib-applehelp==1.0.2 # via sphinx @@ -213,6 +222,8 @@ 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 @@ -238,7 +249,7 @@ types-pyyaml==6.0.12.20240311 # responses types-setuptools==70.0.0.20240524 # via -r requirements-dev.in -typing-extensions==4.7.1 +typing-extensions==4.12.1 # via # astroid # mypy @@ -259,7 +270,7 @@ werkzeug==3.0.3 # via # -r requirements-dev.in # moto -wheel==0.38.4 +wheel==0.43.0 # via # -r requirements-dev.in # pip-tools diff --git a/requirements.txt b/requirements.txt index 6803da1a..f599c9ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,21 +4,21 @@ # # pip-compile # -annotated-types==0.5.0 +annotated-types==0.7.0 # via pydantic -arrow==1.2.3 +arrow==1.3.0 # via jinja2-time aws-codeseeder==1.0.0 # via seed-farmer (setup.py) binaryornot==0.4.4 # via cookiecutter -boto3==1.33.13 +boto3==1.34.120 # via aws-codeseeder -botocore==1.33.13 +botocore==1.34.120 # via # boto3 # s3transfer -certifi==2023.7.22 +certifi==2024.6.2 # via # aws-codeseeder # requests @@ -38,7 +38,7 @@ coloredlogs==15.0.1 # via executor commonmark==0.9.1 # via rich -cookiecutter==2.1.1 +cookiecutter==2.6.0 # via seed-farmer (setup.py) executor==23.2 # via seed-farmer (setup.py) @@ -48,7 +48,7 @@ gitdb==4.0.11 # via gitpython gitignore-parser==0.1.11 # via seed-farmer (setup.py) -gitpython==3.1.42 +gitpython==3.1.43 # via seed-farmer (setup.py) humanfriendly==10.0 # via @@ -71,23 +71,23 @@ markupsafe==2.1.5 # via jinja2 mypy-extensions==1.0.0 # via aws-codeseeder -packaging==23.2 +packaging==24.0 # via seed-farmer (setup.py) property-manager==3.0 # via executor -pydantic==2.5.3 +pydantic==2.7.3 # via seed-farmer (setup.py) -pydantic-core==2.14.6 +pydantic-core==2.18.4 # via pydantic -pygments==2.17.2 +pygments==2.18.0 # via rich -pyhumps==3.5.3 +pyhumps==3.8.0 # via seed-farmer (setup.py) -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # arrow # botocore -python-dotenv==0.21.1 +python-dotenv==1.0.1 # via seed-farmer (setup.py) python-slugify==8.0.4 # via cookiecutter @@ -97,13 +97,13 @@ pyyaml==6.0.1 # cfn-flip # cookiecutter # seed-farmer (setup.py) -requests==2.32.0 +requests==2.32.3 # via # cookiecutter # seed-farmer (setup.py) -rich==12.4.4 +rich==13.7.1 # via seed-farmer (setup.py) -s3transfer==0.8.2 +s3transfer==0.10.1 # via boto3 six==1.16.0 # via @@ -114,7 +114,7 @@ smmap==5.0.1 # via gitdb text-unidecode==1.3 # via python-slugify -typing-extensions==4.11.0 +typing-extensions==4.12.1 # via # pydantic # pydantic-core diff --git a/setup.py b/setup.py index c6f6ead3..38e1ca59 100644 --- a/setup.py +++ b/setup.py @@ -46,20 +46,20 @@ python_requires=">=3.8,<3.13", install_requires=[ "aws-codeseeder~=1.0.0", - "cookiecutter~=2.1.0", - "pyhumps~=3.5.0", - "pydantic~=2.5.3", + "cookiecutter>=2.1,<2.7", + "pyhumps>=3.5,<3.9", + "pydantic>=2.5.3,<2.8.0", "executor~=23.2", "typing-extensions>=4.6.3", - "rich~=12.4.0", + "rich>=12.4,<13.8", "requests>=2.28,<2.33", - "python-dotenv~=0.21.0", + "python-dotenv>=0.21,<1.1", "gitpython~=3.1.30", "gitignore-parser~=0.1.2", "pyyaml~=6.0.1", "urllib3~=1.26.17", - "certifi~=2023.7.22", - "packaging~=23.2", + "certifi>=2023.7.22,<2024.7.0", + "packaging>=23.2,<25.0", ], entry_points={"console_scripts": ["seedfarmer = seedfarmer.__main__:main"]}, classifiers=[ From 8b702f70694525548fc7b4673fe32a0e3e622762 Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Wed, 5 Jun 2024 16:56:33 -0400 Subject: [PATCH 2/2] cleaning for mypy --- seedfarmer/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/seedfarmer/utils.py b/seedfarmer/utils.py index 12530879..836f4475 100644 --- a/seedfarmer/utils.py +++ b/seedfarmer/utils.py @@ -61,10 +61,10 @@ def upper_snake_case(value: str) -> str: str the string standardized """ - if humps.is_camelcase(value): # type: ignore - return humps.decamelize(value).upper() # type: ignore - elif humps.is_pascalcase(value): # type: ignore - return humps.depascalize(value).upper() # type: ignore + if humps.is_camelcase(value): + return humps.decamelize(value).upper() + elif humps.is_pascalcase(value): + return humps.depascalize(value).upper() else: return value.replace("-", "_").upper()