diff --git a/changelog.md b/changelog.md index 50c40a1..d44b29b 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Switch from `distutils` (deprecated) to `packaging` + [[PR](https://github.com/f-dangel/unfoldNd/pull/39)] + ## [0.2.2] - 2024-06-14 - Switch from `pkg_resources` (deprecated) to `importlib`+`distutils`, deprecate diff --git a/setup.cfg b/setup.cfg index 1c4560b..fb82574 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,9 +28,12 @@ zip_safe = False packages = find: include_package_data = True setup_requires = + packaging + setuptools>=38.3 setuptools_scm # Dependencies of the project (semicolon/line-separated): install_requires = + packaging torch numpy # The usage of test_requires is discouraged, see `Dependency Management` docs @@ -106,4 +109,4 @@ match = .*\.py [darglint] docstring_style = google # short, long, full -strictness = short \ No newline at end of file +strictness = short diff --git a/setup.py b/setup.py index a530ae9..25fdee8 100644 --- a/setup.py +++ b/setup.py @@ -4,14 +4,14 @@ """ import sys -from distutils.version import LooseVersion +from packaging.version import Version from importlib.metadata import PackageNotFoundError, version from setuptools import setup try: - setuptools_version = LooseVersion(version("setuptools")) - required_version = LooseVersion("38.3") + setuptools_version = Version(version("setuptools")) + required_version = Version("38.3") if setuptools_version < required_version: print("Error: version of setuptools is too old (<38.3)!") sys.exit(1) diff --git a/unfoldNd/utils.py b/unfoldNd/utils.py index e7c6200..05dc23e 100644 --- a/unfoldNd/utils.py +++ b/unfoldNd/utils.py @@ -1,6 +1,6 @@ """Shared utility functions.""" -from distutils.version import LooseVersion +from packaging.version import Version from importlib.metadata import version from typing import Callable @@ -15,8 +15,8 @@ ) from torch.nn.modules.utils import _pair, _single, _triple -TORCH_VERSION = LooseVersion(version("torch")) -TORCH_VERSION_AT_LEAST_1_12_0 = TORCH_VERSION >= LooseVersion("1.12.0") +TORCH_VERSION = Version(version("torch")) +TORCH_VERSION_AT_LEAST_1_12_0 = TORCH_VERSION >= Version("1.12.0") def _get_kernel_size_numel(kernel_size):