Skip to content

Commit 52d6e1f

Browse files
fix #918: use packaging from setuptools for self-build
1 parent 4bc06ac commit 52d6e1f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.rst

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

44
bugfix
55
------
6+
* fix #918: use packaging from setuptools for self-build
67
* fix #914: ignore the deprecated git archival plugin as its integrated now
78
* fix #912: ensure mypy safety of the version template + regression test
89
* fix #913: use 240s timeout instead of 20 for git unshallow

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
build-backend = "_own_version_helper"
55
requires = [
66
'importlib-metadata>=4.6; python_version < "3.10"',
7-
"packaging>=20",
87
"rich",
98
"setuptools>=61",
109
'tomli; python_version < "3.11"',

src/setuptools_scm/_version_cls.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
from typing import Type
66
from typing import Union
77

8-
from packaging.version import InvalidVersion
9-
from packaging.version import Version as Version
8+
try:
9+
from packaging.version import InvalidVersion
10+
from packaging.version import Version as Version
11+
except ImportError:
12+
from setuptools.extern.packaging.version import InvalidVersion # type: ignore
13+
from setuptools.extern.packaging.version import Version as Version # type: ignore
1014

1115

1216
class NonNormalizedVersion(Version):

0 commit comments

Comments
 (0)