diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 246e34f..18d7923 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -45,6 +45,9 @@ jobs: environment-file: ci/environment.yml extra-specs: | python=${{ matrix.python-version }} + - name: Fetch all history for all tags and branches + run: | + git fetch --prune --unshallow - name: Set up conda environment run: | python -m pip install -e . diff --git a/arm_test_data/__init__.py b/arm_test_data/__init__.py index 1f8a4be..7f25991 100644 --- a/arm_test_data/__init__.py +++ b/arm_test_data/__init__.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 # flake8: noqa """Top-level module for pythia-datasets .""" -from pkg_resources import DistributionNotFound, get_distribution +import importlib.metadata as _importlib_metadata from .dataset import DATASETS, locate try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: # pragma: no cover + __version__ = _importlib_metadata.version("arm-test-data") +except _importlib_metadata.PackageNotFoundError: # pragma: no cover # package is not installed __version__ = 'unknown' # pragma: no cover diff --git a/arm_test_data/dataset.py b/arm_test_data/dataset.py index 0966db9..3c0b270 100644 --- a/arm_test_data/dataset.py +++ b/arm_test_data/dataset.py @@ -1,4 +1,4 @@ -import pkg_resources +import importlib.resources import pooch DATASETS = pooch.create( @@ -7,7 +7,7 @@ env='ARM_TEST_DATA_DIR', ) -with pkg_resources.resource_stream('arm_test_data', 'registry.txt') as registry_file: +with open(importlib.resources.files('arm_test_data') / 'registry.txt') as registry_file: DATASETS.load_registry(registry_file) diff --git a/ci/environment.yml b/ci/environment.yml index 0752688..2944ce6 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -7,3 +7,5 @@ dependencies: - pooch - pre-commit - pytest-cov + - setuptools + - setuptools-scm