Skip to content

Commit 4822165

Browse files
ensure python 3.10 support
1 parent 1504905 commit 4822165

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

.github/workflows/python-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
python_version: [ '3.6', '3.7', '3.8', '3.9', 'pypy3' ]
19+
python_version: [ '3.6', '3.7', '3.8', '3.9', '3.10-dev', 'pypy3' ]
2020
os: [windows-latest, ubuntu-latest] #, macos-latest]
2121
include:
2222
- os: windows-latest

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ v6.2.0
33

44
* fix #608: resolve tomli dependency issue by making it a hard dependency
55
as all intended/supported install options use pip/wheel this is only a feature release
6+
* ensure python 3.10 works
67

78
v6.1.1
89
=======

src/setuptools_scm/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,11 @@ def require_command(name):
151151
else:
152152

153153
def iter_entry_points(group: str, name: Optional[str] = None):
154-
eps = entry_points()[group]
154+
all_eps = entry_points()
155+
if hasattr(all_eps, "select"):
156+
eps = all_eps.select(group=group)
157+
else:
158+
eps = all_eps[group]
155159
if name is None:
156160
return iter(eps)
157161
return (ep for ep in eps if ep.name == name)

testing/test_setuptools_support.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def check(packagedir, expected_version, **env):
5656
)
5757

5858

59+
@pytest.mark.skipif(
60+
sys.version_info[:2] >= (3, 10), reason="old setuptools wont work on python 3.10"
61+
)
5962
def test_distlib_setuptools_works(get_setuptools_packagedir):
6063
packagedir = get_setuptools_packagedir("45.0.0")
6164
check(packagedir, "45.0.0")

0 commit comments

Comments
 (0)