Skip to content

Commit 2b0e980

Browse files
authored
Merge pull request #230 from effigies/fix/purge_setuptools
fix: Remove pkg_resources dependency
2 parents c3f6fa2 + 6a248eb commit 2b0e980

File tree

2 files changed

+3
-34
lines changed

2 files changed

+3
-34
lines changed

nitransforms/__init__.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@
2525
try:
2626
from ._version import __version__
2727
except ModuleNotFoundError:
28-
from pkg_resources import get_distribution, DistributionNotFound
29-
30-
try:
31-
__version__ = get_distribution("nitransforms").version
32-
except DistributionNotFound:
33-
__version__ = "unknown"
34-
del get_distribution
35-
del DistributionNotFound
28+
__version__ = "0+unknown"
3629

3730
__packagename__ = "nitransforms"
3831
__copyright__ = "Copyright (c) 2021 The NiPy developers"

nitransforms/tests/test_version.py

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
"""Test _version.py."""
22
import sys
3-
from collections import namedtuple
43
from importlib import reload
5-
import pytest
64
import nitransforms
75

8-
try:
9-
from pkg_resources import DistributionNotFound
10-
except ImportError:
11-
pytest.skip(allow_module_level=True)
12-
136

147
def test_version_scm0(monkeypatch):
158
"""Retrieve the version via setuptools_scm."""
@@ -22,26 +15,9 @@ class _version:
2215
assert nitransforms.__version__ == "10.0.0"
2316

2417

25-
def test_version_scm1(monkeypatch):
26-
"""Retrieve the version via pkg_resources."""
27-
monkeypatch.setitem(sys.modules, "nitransforms._version", None)
28-
29-
def _dist(name):
30-
Distribution = namedtuple("Distribution", ["name", "version"])
31-
return Distribution(name, "success")
32-
33-
monkeypatch.setattr("pkg_resources.get_distribution", _dist)
34-
reload(nitransforms)
35-
assert nitransforms.__version__ == "success"
36-
37-
38-
def test_version_scm2(monkeypatch):
18+
def test_version_fallback(monkeypatch):
3919
"""Check version could not be interpolated."""
4020
monkeypatch.setitem(sys.modules, "nitransforms._version", None)
4121

42-
def _raise(name):
43-
raise DistributionNotFound("No get_distribution mock")
44-
45-
monkeypatch.setattr("pkg_resources.get_distribution", _raise)
4622
reload(nitransforms)
47-
assert nitransforms.__version__ == "unknown"
23+
assert nitransforms.__version__ == "0+unknown"

0 commit comments

Comments
 (0)