diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e306aab..3e09713 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,8 +14,8 @@ jobs: id-token: write # mandatory for trusted publishing steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6d87642..fa78d3a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,11 +13,11 @@ jobs: strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -26,7 +26,7 @@ jobs: git config --global user.name tester git config --global user.email tester@example.com - run: tox -e py - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: files: .tox/test-reports/coverage.xml @@ -37,11 +37,11 @@ jobs: strategy: matrix: - python-version: ['3.6', '3.7'] + python-version: ['3.7', '3.8', '3.9'] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -50,7 +50,7 @@ jobs: git config --global user.name tester git config --global user.email tester@example.com - run: tox -e py - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: files: .tox/test-reports/coverage.xml @@ -59,10 +59,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' - run: pip install -U pip tox - run: tox -e docs,style,security diff --git a/HISTORY.rst b/HISTORY.rst index ae53710..3a4b3db 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,14 @@ Release notes ============= +3.7.0 (2025-03-20) +------------------ + +* Adapted ``CheckCommand`` to setuptools v77.0.3 + +* Dropped support for Python 3.6 + + 3.6.0 (2023-12-04) ------------------ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..fed528d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 0cad519..d12ae7c 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def complete_args(args): name="setupmeta", entry_points=ENTRY_POINTS, packages=["setupmeta"], - python_requires=">=3.6", + python_requires=">=3.7", zip_safe=True, classifiers=[ "Development Status :: 5 - Production/Stable", @@ -71,12 +71,13 @@ def complete_args(args): "Operating System :: Unix", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Build Tools", diff --git a/setupmeta/__init__.py b/setupmeta/__init__.py index 1e2f553..80f26ba 100644 --- a/setupmeta/__init__.py +++ b/setupmeta/__init__.py @@ -783,7 +783,7 @@ def __exit__(self, *args): def meta_command_init(self, dist, **kwargs): """Custom __init__ injected to commands decorated with @MetaCommand""" self.setupmeta = getattr(dist, "_setupmeta", None) - setuptools.Command.__init__(self, dist, **kwargs) + super(self.__class__, self).__init__(dist, **kwargs) class UsageError(Exception): diff --git a/tox.ini b/tox.ini index beee963..11d9a98 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] -envlist = py{36,37,38,39,310,311}, coverage, docs, style, security -skip_missing_interpreters = true - +envlist = py{37,38,39,310,311,312,313}, coverage, docs, style, security +# Pointing to pypi.org mirror explicitly to avoid using internal mirrors in place at some companies +# This is usually not necessary, but can be useful in some cases (eg: latest setuptools not on internal mirror) +indexserver = + default = https://pypi.org/simple [testenv] -passenv = CI - GITHUB_* setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname} usedevelop = True deps = -rtests/requirements.txt