Skip to content

Commit dca98f8

Browse files
committed
Add fallback for old packaging
1 parent c2608c5 commit dca98f8

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ testing-integration =
8989
jaraco.envs>=2.2
9090
build[virtualenv]>=1.0.3
9191
filelock>=3.4.0
92-
packaging
92+
packaging>=23.1 # TODO: update once packaging 23.2 is available
9393

9494
docs =
9595
# upstream

setuptools/tests/_packaging_compat.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
from packaging import __version__ as packaging_version
2+
3+
if tuple(packaging_version.split(".")) >= ("23", "2"):
4+
from packaging.metadata import Metadata
5+
else:
6+
# Just pretend it exists while waiting for release...
7+
from unittest.mock import MagicMock
8+
9+
Metadata = MagicMock()

setuptools/tests/config/test_apply_pyprojecttoml.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
import pytest
1515
from ini2toml.api import Translator
16-
from packaging.metadata import Metadata
16+
17+
# TODO: replace with `from packaging.metadata import Metadata` in future versions
18+
from .._packaging_compat import Metadata
1719

1820
import setuptools # noqa ensure monkey patch to metadata
1921
from setuptools.dist import Distribution

setuptools/tests/test_core_metadata.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
import pytest
77

8-
from packaging.metadata import Metadata
8+
# TODO: replace with `from packaging.metadata import Metadata` in future versions:
9+
from ._packaging_compat import Metadata
910

1011
from setuptools import sic, _reqs
1112
from setuptools.dist import Distribution

0 commit comments

Comments
 (0)