diff options
| author | Timo Röhling <roehling@debian.org> | 2026-04-21 08:38:44 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2026-04-21 10:45:37 +0000 |
| commit | 5ad3da646b21acc9948aeaeeff1938ae5be1b100 (patch) | |
| tree | fcbbc5055c7dd175fd89c24742df63b08dabf575 | |
| parent | 216401c20903286ffc897f4697d2863cd03ee660 (diff) | |
3.0.9-1 (patches unapplied)HEADimport/3.0.9-1ubuntu/stonking-proposedubuntu/stonking-develubuntu/stonkingubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* New upstream version 3.0.9
* Migrate debian/watch to version 5 format
* Bump Standards-Version to 4.7.4
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cloup/_util.py | 5 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/watch | 8 | ||||
| -rw-r--r-- | requirements/dev.txt | 197 | ||||
| -rw-r--r-- | requirements/docs.in | 1 | ||||
| -rw-r--r-- | requirements/docs.txt | 11 | ||||
| -rw-r--r-- | requirements/test.txt | 26 | ||||
| -rw-r--r-- | setup.py | 2 |
10 files changed, 155 insertions, 107 deletions
@@ -108,7 +108,7 @@ release: dist ## package and upload a release test-release: dist ## package and upload a release twine upload --repository testpypi dist/* -PIP_COMPILE := pip-compile --resolver=backtracking --no-emit-index-url +PIP_COMPILE := pip-compile --allow-unsafe --resolver=backtracking --no-emit-index-url .PHONY: pip-compile pip-compile: ## pin dependencies in requirements/ using the current env diff --git a/cloup/_util.py b/cloup/_util.py index 5f66335..ce6e92c 100644 --- a/cloup/_util.py +++ b/cloup/_util.py @@ -1,13 +1,12 @@ """Generic utilities.""" +import importlib.metadata from typing import ( Any, Dict, Hashable, Iterable, List, Optional, Sequence, Type, TypeVar, ) -import click - from cloup.typing import MISSING, Possibly -click_version_tuple = tuple(click.__version__.split('.')) +click_version_tuple = tuple(importlib.metadata.version("click").split('.')) click_major = int(click_version_tuple[0]) click_minor = int(click_version_tuple[1]) click_version_ge_8_1 = (click_major, click_minor) >= (8, 1) diff --git a/debian/changelog b/debian/changelog index d5ebaa3..23bd69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-cloup (3.0.9-1) unstable; urgency=medium + + * New upstream version 3.0.9 + * Migrate debian/watch to version 5 format + * Bump Standards-Version to 4.7.4 + + -- Timo Röhling <roehling@debian.org> Tue, 21 Apr 2026 08:38:44 +0200 + python-cloup (3.0.8-1) unstable; urgency=medium * New upstream version 3.0.8 diff --git a/debian/control b/debian/control index b7bee3e..ef69588 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: python3-sphinx-issues <!nodoc>, python3-sphinx-panels <!nodoc>, Homepage: https://github.com/janluke/cloup -Standards-Version: 4.7.2 +Standards-Version: 4.7.4 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/python-team/packages/python-cloup.git Vcs-Browser: https://salsa.debian.org/python-team/packages/python-cloup diff --git a/debian/watch b/debian/watch index f5dca85..c282193 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,5 @@ -version=4 -opts=filenamemangle=s%(?:.*?)?v?(\d[\d.]*@ARCHIVE_EXT@)%@PACKAGE@-$1% \ - https://github.com/janluke/cloup/tags (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@ +Version: 5 + +Template: GitHub +Owner: janluke +Project: cloup diff --git a/requirements/dev.txt b/requirements/dev.txt index c2f7851..9b74a09 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,137 +1,154 @@ # -# 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 --no-emit-index-url requirements/dev.in +# pip-compile --allow-unsafe --no-emit-index-url requirements/dev.in # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -astroid==3.2.4 +anyio==4.12.1 + # via + # starlette + # watchfiles +astroid==3.3.11 # via sphinx-autoapi -babel==2.16.0 +babel==2.18.0 # via sphinx backports-tarfile==1.2.0 # via jaraco-context -beautifulsoup4==4.12.3 +beautifulsoup4==4.14.3 # via furo -certifi==2024.8.30 +certifi==2026.2.25 # via requests -cffi==1.17.1 +cffi==2.0.0 # via cryptography -charset-normalizer==3.4.0 +charset-normalizer==3.4.6 # via requests +click==8.1.8 + # via uvicorn colorama==0.4.6 # via sphinx-autobuild -coverage[toml]==7.6.1 +coverage[toml]==7.10.7 # via pytest-cov -cryptography==44.0.0 +cryptography==46.0.5 # via secretstorage -distlib==0.3.9 +distlib==0.4.0 # via virtualenv docutils==0.16 # via # readme-renderer # sphinx # sphinx-panels -exceptiongroup==1.2.2 - # via pytest -filelock==3.16.1 +exceptiongroup==1.3.1 + # via + # anyio + # pytest +filelock==3.19.1 # via + # python-discovery # tox # virtualenv -flake8==7.1.1 +flake8==7.3.0 # via -r requirements/dev.in furo==2021.4.11b34 - # via -r docs.in -idna==3.10 - # via requests -imagesize==1.4.1 + # via -r requirements/docs.in +h11==0.16.0 + # via uvicorn +id==1.6.1 + # via twine +idna==3.11 + # via + # anyio + # requests +imagesize==1.5.0 # via sphinx -importlib-metadata==8.5.0 +importlib-metadata==8.7.1 # via # keyring # twine -importlib-resources==6.4.5 - # via keyring -iniconfig==2.0.0 +iniconfig==2.1.0 # via pytest jaraco-classes==3.4.0 # via keyring -jaraco-context==6.0.1 +jaraco-context==6.1.1 # via keyring -jaraco-functools==4.1.0 +jaraco-functools==4.4.0 # via keyring -jeepney==0.8.0 +jeepney==0.9.0 # via # keyring # secretstorage jinja2==3.0.3 # via - # -r docs.in + # -r requirements/docs.in # sphinx # sphinx-autoapi -keyring==25.5.0 +keyring==25.7.0 # via twine -livereload==2.7.0 - # via sphinx-autobuild +librt==0.8.1 + # via mypy markdown-it-py==3.0.0 # via rich -markupsafe==2.1.5 +markupsafe==3.0.3 # via jinja2 mccabe==0.7.0 # via flake8 mdurl==0.1.2 # via markdown-it-py -more-itertools==10.5.0 +more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -mypy==1.13.0 +mypy==1.19.1 # via -r requirements/dev.in -mypy-extensions==1.0.0 +mypy-extensions==1.1.0 # via mypy -nh3==0.2.19 +nh3==0.3.3 # via readme-renderer -packaging==24.2 +packaging==26.0 # via # pytest # sphinx # tox # twine -pkginfo==1.12.0 - # via twine -platformdirs==4.3.6 - # via virtualenv -pluggy==1.5.0 +pathspec==1.0.4 + # via mypy +platformdirs==4.4.0 + # via + # python-discovery + # virtualenv +pluggy==1.6.0 # via # pytest + # pytest-cov # tox py==1.11.0 # via tox -pycodestyle==2.12.1 +pycodestyle==2.14.0 # via flake8 -pycparser==2.22 +pycparser==2.23 # via cffi -pyflakes==3.2.0 +pyflakes==3.4.0 # via flake8 -pygments==2.18.0 +pygments==2.19.2 # via + # pytest # readme-renderer # rich # sphinx -pytest==8.3.4 +pytest==8.4.2 # via - # -r test.in + # -r requirements/test.in # pytest-cov -pytest-cov==5.0.0 - # via -r test.in -pytz==2024.2 - # via babel -pyyaml==6.0.2 +pytest-cov==7.0.0 + # via -r requirements/test.in +python-discovery==1.1.3 + # via virtualenv +pyyaml==6.0.3 # via sphinx-autoapi readme-renderer==43.0 # via twine -requests==2.32.3 +requests==2.32.5 # via # requests-toolbelt # sphinx @@ -140,19 +157,19 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.9.4 +rich==14.3.3 # via twine secretstorage==3.3.3 # via keyring six==1.17.0 # via tox -snowballstemmer==2.2.0 +snowballstemmer==3.0.1 # via sphinx -soupsieve==2.6 +soupsieve==2.8.3 # via beautifulsoup4 sphinx==3.5.4 # via - # -r docs.in + # -r requirements/docs.in # furo # sphinx-autoapi # sphinx-autobuild @@ -161,58 +178,72 @@ sphinx==3.5.4 # sphinx-panels # sphinx-version-warning sphinx-autoapi==1.8.4 - # via -r docs.in -sphinx-autobuild==2021.3.14 + # via -r requirements/docs.in +sphinx-autobuild==2024.10.3 # via -r requirements/dev.in sphinx-copybutton==0.5.2 - # via -r docs.in + # via -r requirements/docs.in sphinx-issues==3.0.1 - # via -r docs.in + # via -r requirements/docs.in sphinx-panels==0.6.0 - # via -r docs.in + # via -r requirements/docs.in sphinx-version-warning==1.1.2 - # via -r docs.in -sphinxcontrib-applehelp==1.0.4 + # via -r requirements/docs.in +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -tomli==2.2.1 +starlette==0.49.3 + # via sphinx-autobuild +tomli==2.4.0 # via # coverage # mypy # pytest # tox -tornado==6.4.2 - # via livereload tox==3.28.0 # via -r requirements/dev.in -twine==6.0.1 +twine==6.2.0 # via -r requirements/dev.in -typing-extensions==4.12.2 +typing-extensions==4.15.0 # via + # anyio # astroid + # beautifulsoup4 + # cryptography + # exceptiongroup # mypy - # rich -unidecode==1.3.8 + # starlette + # uvicorn + # virtualenv +unidecode==1.4.0 # via sphinx-autoapi -urllib3==2.2.3 +urllib3==2.6.3 # via + # id # requests # twine -virtualenv==20.28.0 +uvicorn==0.39.0 + # via sphinx-autobuild +virtualenv==21.2.0 # via tox -zipp==3.20.2 - # via - # importlib-metadata - # importlib-resources +watchfiles==1.1.1 + # via sphinx-autobuild +websockets==15.0.1 + # via sphinx-autobuild +zipp==3.23.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools +setuptools==80.10.2 + # via + # -r requirements/docs.in + # sphinx diff --git a/requirements/docs.in b/requirements/docs.in index d956b97..8638857 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,3 +1,4 @@ +setuptools < 81 sphinx <5 sphinx-autoapi ~= 1.8.4 furo == 2021.4.11b34 diff --git a/requirements/docs.txt b/requirements/docs.txt index 72ad0d0..eb0237e 100644 --- a/requirements/docs.txt +++ b/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 --no-emit-index-url --resolver=backtracking requirements/docs.in +# pip-compile --allow-unsafe --no-emit-index-url requirements/docs.in # alabaster==0.7.13 # via sphinx @@ -39,8 +39,6 @@ packaging==23.1 # via sphinx pygments==2.15.1 # via sphinx -pytz==2023.3 - # via babel pyyaml==6.0 # via sphinx-autoapi requests==2.31.0 @@ -90,4 +88,7 @@ wrapt==1.15.0 # via astroid # The following packages are considered to be unsafe in a requirements file: -# setuptools +setuptools==80.10.2 + # via + # -r requirements/docs.in + # sphinx diff --git a/requirements/test.txt b/requirements/test.txt index 9a6a273..37a6a0e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,26 +1,32 @@ # -# 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 --no-emit-index-url requirements/test.in +# pip-compile --allow-unsafe --no-emit-index-url requirements/test.in # -coverage[toml]==7.6.1 +coverage[toml]==7.10.7 # via pytest-cov -exceptiongroup==1.2.2 +exceptiongroup==1.3.1 # via pytest -iniconfig==2.0.0 +iniconfig==2.1.0 # via pytest -packaging==24.2 +packaging==26.0 # via pytest -pluggy==1.5.0 +pluggy==1.6.0 + # via + # pytest + # pytest-cov +pygments==2.19.2 # via pytest -pytest==8.3.4 +pytest==8.4.2 # via # -r requirements/test.in # pytest-cov -pytest-cov==5.0.0 +pytest-cov==7.0.0 # via -r requirements/test.in -tomli==2.2.1 +tomli==2.4.0 # via # coverage # pytest +typing-extensions==4.15.0 + # via exceptiongroup @@ -16,7 +16,7 @@ def make_long_description(write_file=False): setup( name='cloup', - setup_requires=['setuptools_scm'], + setup_requires=['setuptools_scm<10'], use_scm_version={ 'write_to': 'cloup/_version.py' }, |