From de96c94bde76c54f7edfc91e4d5eb13a01110f02 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 25 Jun 2025 13:34:25 -0700 Subject: [PATCH 1/3] update requirements*.txt --- .../ad02e7c6359a43f59a92cf53c8b13e8c.md | 4 ++ requirements-dev.txt | 57 ++++++++++--------- requirements.txt | 2 +- script/changelog | 9 +++ 4 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 .changelog/ad02e7c6359a43f59a92cf53c8b13e8c.md diff --git a/.changelog/ad02e7c6359a43f59a92cf53c8b13e8c.md b/.changelog/ad02e7c6359a43f59a92cf53c8b13e8c.md new file mode 100644 index 0000000..57b89f2 --- /dev/null +++ b/.changelog/ad02e7c6359a43f59a92cf53c8b13e8c.md @@ -0,0 +1,4 @@ +--- +type: none +--- +requirements-dev.txt requirements.txt \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index b2e7d80..6fbe6f0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,48 +1,49 @@ # DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update -Pygments==2.18.0 +Pygments==2.19.2 +SecretStorage==3.3.3 black==24.10.0 build==1.2.2.post1 -certifi==2024.8.30 +certifi==2025.6.15 cffi==1.17.1 -charset-normalizer==3.3.2 -click==8.1.7 -cmarkgfm==2024.1.14 -coverage==7.6.1 +charset-normalizer==3.4.2 +click==8.2.1 +cmarkgfm==2024.11.20 +coverage==7.9.1 +cryptography==45.0.4 docutils==0.21.2 -importlib_metadata==8.5.0 -iniconfig==2.0.0 -isort==5.13.2 +id==1.5.0 +iniconfig==2.1.0 +isort==6.0.1 jaraco.classes==3.4.0 jaraco.context==6.0.1 -jaraco.functools==4.1.0 -keyring==25.4.1 +jaraco.functools==4.2.1 +jeepney==0.9.0 +keyring==25.6.0 markdown-it-py==3.0.0 mdurl==0.1.2 -more-itertools==10.5.0 -mypy-extensions==1.0.0 -nh3==0.2.18 -packaging==24.1 +more-itertools==10.7.0 +mypy_extensions==1.1.0 +nh3==0.2.21 +packaging==25.0 pathspec==0.12.1 -pkginfo==1.10.0 -platformdirs==4.3.6 -pluggy==1.5.0 +platformdirs==4.3.8 +pluggy==1.6.0 pprintpp==0.4.0 pycountry-convert==0.7.2 pycountry==24.6.1 pycparser==2.22 -pyflakes==3.2.0 +pyflakes==3.4.0 pyproject_hooks==1.2.0 -pytest-cov==5.0.0 -pytest-mock==3.14.0 -pytest==8.3.3 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest==8.4.1 pytest_network==0.0.1 readme_renderer==44.0 repoze.lru==0.7 requests-toolbelt==1.0.0 -requests==2.32.3 +requests==2.32.4 rfc3986==2.0.0 -rich==13.9.2 -twine==5.1.1 -urllib3==2.2.3 -wheel==0.44.0 -zipp==3.20.2 +rich==14.0.0 +twine==6.1.0 +urllib3==2.5.0 +wheel==0.45.1 diff --git a/requirements.txt b/requirements.txt index dfef368..a40f955 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ fqdn==1.5.1 idna==3.10 natsort==8.4.0 python-dateutil==2.9.0.post0 -six==1.16.0 +six==1.17.0 diff --git a/script/changelog b/script/changelog index 0c7dd42..4623dc8 100755 --- a/script/changelog +++ b/script/changelog @@ -39,6 +39,12 @@ def create(argv): See https://semver.org/ for more info''', ) + parser.add_argument( + '-a', + '--add', + default=False, + help='git add the newly created changelog entry', + ) parser.add_argument( 'md', metavar='change-description-markdown', @@ -63,6 +69,9 @@ and links.''', f'Created {filepath}, it can be further edited and should be committed to your branch.' ) + if args.add: + run(['git', 'add', filepath]) + def check(argv): if isdir('.changelog'): From 6d5574a2e00025573179248ab561b3ff56ba6050 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 16 Jun 2025 18:24:21 -0700 Subject: [PATCH 2/3] Special handling for click w/python 3.9 --- script/update-requirements | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/script/update-requirements b/script/update-requirements index 7696f6d..c1adc47 100755 --- a/script/update-requirements +++ b/script/update-requirements @@ -42,6 +42,18 @@ dev_frozen = sorted( [p for p in dev_frozen if not p.startswith(our_package_name)] ) +# special handling for click until python 3.9 is gone due to it dropping +# support for active versions early +i = [i for i, r in enumerate(dev_frozen) if r.startswith('click==')][0] +dev_frozen = ( + dev_frozen[:i] + + [ + "click==8.1.8; python_version<'3.10'", + f"{dev_frozen[i]}; python_version>='3.10'", + ] + + dev_frozen[i + 1 :] +) + print_packages(frozen, 'frozen') print_packages(dev_frozen, 'dev_frozen') From 11deb858800968800d250604554ba8635a64fede Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 25 Jun 2025 13:38:45 -0700 Subject: [PATCH 3/3] click requirements-dev.txt update --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 6fbe6f0..3f5ee4e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,8 @@ build==1.2.2.post1 certifi==2025.6.15 cffi==1.17.1 charset-normalizer==3.4.2 -click==8.2.1 +click==8.1.8; python_version<'3.10' +click==8.2.1; python_version>='3.10' cmarkgfm==2024.11.20 coverage==7.9.1 cryptography==45.0.4