Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -26,7 +26,7 @@ jobs:
git config --global user.name tester
git config --global user.email [email protected]
- run: tox -e py
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: .tox/test-reports/coverage.xml

Expand All @@ -37,11 +37,11 @@ jobs:

strategy:
matrix:
python-version: ['3.6', '3.7']
python-version: ['3.7', '3.8', '3.9']
Copy link
Member

@thatch thatch Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there isn't CI running on 3.6 I'm reluctant to say setupmeta is compatible with it. Am I reading this right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests pass with 3.6, but there is some unrelated failure on py3.6 venv creation currently on GH actions. setupmeta's is still py3.6 compatible, but it is getting harder to exercise py3.6 indeed (including locally, where you can't use tox-uv for exameple, must use tox v3)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped python_requires to 3.7+. You're right, no point in trying to keep 3.6 around any longer.


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 }}

Expand All @@ -50,7 +50,7 @@ jobs:
git config --global user.name tester
git config --global user.email [email protected]
- run: tox -e py
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: .tox/test-reports/coverage.xml

Expand All @@ -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
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ def complete_args(args):
"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",
Expand Down
9 changes: 8 additions & 1 deletion setupmeta/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,14 @@ 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)
ancestor = setuptools.Command
if not isinstance(self, setuptools.Command):
# See https://github.com/pypa/setuptools/issues/4902
import distutils.cmd

ancestor = distutils.cmd.Command

ancestor.__init__(self, dist, **kwargs)


class UsageError(Exception):
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[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
indexserver =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe include a comment about why this apparent no-op is here?

default = https://pypi.org/simple

[testenv]
passenv = CI
Expand Down
Loading