Skip to content

Commit 3270c97

Browse files
zsimicZoran Simic
andauthored
Use base class distutils.cmd.Command if/when necessary (#89)
* Use base class `distutils.cmd.Command` if/when necessary * Retired py3.6 tests - best effort for py3.6 from now on * Require py3.7+, dropped support for py3.6 * Replaced old school class call with `super()` * Added comment explaining why explicitly pointing to pypi.org official mirror --------- Co-authored-by: Zoran Simic <zsimic@netflix.com>
1 parent a082a2d commit 3270c97

File tree

7 files changed

+33
-21
lines changed

7 files changed

+33
-21
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
id-token: write # mandatory for trusted publishing
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/setup-python@v4
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-python@v5
1919
with:
2020
python-version: '3.10'
2121

.github/workflows/tests.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
16+
python-version: ['3.10', '3.11', '3.12', '3.13']
1717

1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-python@v4
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323

@@ -26,7 +26,7 @@ jobs:
2626
git config --global user.name tester
2727
git config --global user.email tester@example.com
2828
- run: tox -e py
29-
- uses: codecov/codecov-action@v3
29+
- uses: codecov/codecov-action@v4
3030
with:
3131
files: .tox/test-reports/coverage.xml
3232

@@ -37,11 +37,11 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
python-version: ['3.6', '3.7']
40+
python-version: ['3.7', '3.8', '3.9']
4141

4242
steps:
43-
- uses: actions/checkout@v3
44-
- uses: actions/setup-python@v4
43+
- uses: actions/checkout@v4
44+
- uses: actions/setup-python@v5
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747

@@ -50,7 +50,7 @@ jobs:
5050
git config --global user.name tester
5151
git config --global user.email tester@example.com
5252
- run: tox -e py
53-
- uses: codecov/codecov-action@v3
53+
- uses: codecov/codecov-action@v4
5454
with:
5555
files: .tox/test-reports/coverage.xml
5656

@@ -59,10 +59,10 @@ jobs:
5959
runs-on: ubuntu-latest
6060

6161
steps:
62-
- uses: actions/checkout@v3
63-
- uses: actions/setup-python@v4
62+
- uses: actions/checkout@v4
63+
- uses: actions/setup-python@v5
6464
with:
65-
python-version: '3.11'
65+
python-version: '3.13'
6666

6767
- run: pip install -U pip tox
6868
- run: tox -e docs,style,security

HISTORY.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Release notes
33
=============
44

5+
3.7.0 (2025-03-20)
6+
------------------
7+
8+
* Adapted ``CheckCommand`` to setuptools v77.0.3
9+
10+
* Dropped support for Python 3.6
11+
12+
513
3.6.0 (2023-12-04)
614
------------------
715

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools"]
3+
build-backend = "setuptools.build_meta"

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def complete_args(args):
6161
name="setupmeta",
6262
entry_points=ENTRY_POINTS,
6363
packages=["setupmeta"],
64-
python_requires=">=3.6",
64+
python_requires=">=3.7",
6565
zip_safe=True,
6666
classifiers=[
6767
"Development Status :: 5 - Production/Stable",
@@ -71,12 +71,13 @@ def complete_args(args):
7171
"Operating System :: Unix",
7272
"Programming Language :: Python",
7373
"Programming Language :: Python :: 3",
74-
"Programming Language :: Python :: 3.6",
7574
"Programming Language :: Python :: 3.7",
7675
"Programming Language :: Python :: 3.8",
7776
"Programming Language :: Python :: 3.9",
7877
"Programming Language :: Python :: 3.10",
7978
"Programming Language :: Python :: 3.11",
79+
"Programming Language :: Python :: 3.12",
80+
"Programming Language :: Python :: 3.13",
8081
"Programming Language :: Python :: Implementation :: CPython",
8182
"Programming Language :: Python :: Implementation :: PyPy",
8283
"Topic :: Software Development :: Build Tools",

setupmeta/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ def __exit__(self, *args):
783783
def meta_command_init(self, dist, **kwargs):
784784
"""Custom __init__ injected to commands decorated with @MetaCommand"""
785785
self.setupmeta = getattr(dist, "_setupmeta", None)
786-
setuptools.Command.__init__(self, dist, **kwargs)
786+
super(self.__class__, self).__init__(dist, **kwargs)
787787

788788

789789
class UsageError(Exception):

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[tox]
2-
envlist = py{36,37,38,39,310,311}, coverage, docs, style, security
3-
skip_missing_interpreters = true
4-
2+
envlist = py{37,38,39,310,311,312,313}, coverage, docs, style, security
3+
# Pointing to pypi.org mirror explicitly to avoid using internal mirrors in place at some companies
4+
# This is usually not necessary, but can be useful in some cases (eg: latest setuptools not on internal mirror)
5+
indexserver =
6+
default = https://pypi.org/simple
57

68
[testenv]
7-
passenv = CI
8-
GITHUB_*
99
setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
1010
usedevelop = True
1111
deps = -rtests/requirements.txt

0 commit comments

Comments
 (0)