Skip to content

Use base class distutils.cmd.Command if/when necessary #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsimic merged 5 commits into from
Mar 20, 2025
+33 −21
Merged

Use base class distutils.cmd.Command if/when necessary #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c49e07
Use base class `distutils.cmd.Command` if/when necessary
Mar 20, 2025
67d6459
Retired py3.6 tests - best effort for py3.6 from now on
Mar 20, 2025
0f24c2d
Require py3.7+, dropped support for py3.6
Mar 20, 2025
20f3b46
Replaced old school class call with `super()`
Mar 20, 2025
0d6eae0
Added comment explaining why explicitly pointing to pypi.org official…
Mar 20, 2025
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
View file
Open in desktop
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
View file
Open in desktop
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 tester@example.com
- 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 •
edited
Loading

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

@zsimic zsimic Mar 20, 2025

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

@zsimic zsimic Mar 20, 2025

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 tester@example.com
- 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
8 changes: 8 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
------------------

Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion setupmeta/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
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.

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

default = https://pypi.org/simple

[testenv]
passenv = CI
GITHUB_*
setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
usedevelop = True
deps = -rtests/requirements.txt
Expand Down
Loading