diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a370aa0..d960bd4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,7 +73,7 @@ jobs: - name: Run tests run: | - python${{ matrix.python-version }} -m pytest --cov=matminer matminer --durations=0 --timeout=360 + python${{ matrix.python-version }} -m pytest --cov=matminer matminer --durations=20 --timeout=360 - name: Build package if: matrix.python-version == 3.9 diff --git a/matminer/__init__.py b/matminer/__init__.py index 130045a6..61e7a1e5 100644 --- a/matminer/__init__.py +++ b/matminer/__init__.py @@ -1,9 +1,9 @@ """data mining materials properties""" -from pkg_resources import DistributionNotFound, get_distribution +from importlib.metadata import PackageNotFoundError, version try: - __version__ = get_distribution("matminer").version -except DistributionNotFound: # pragma: no cover + __version__ = version("matminer") +except PackageNotFoundError: # pragma: no cover # package is not installed pass diff --git a/pyproject.toml b/pyproject.toml index 77d85ff4..adbe3e6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,5 @@ [build-system] requires = [ - # pin NumPy version used in the build - "numpy>=1.20.1, <2", "setuptools>=43.0.0", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index c0e79f2d..7cc859eb 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def local_version(version): include_package_data=True, zip_safe=False, install_requires=[ - "numpy >= 1.23, < 2", + "numpy >= 1.23", "requests ~= 2.31", "pandas >= 1.5, < 3", "tqdm ~= 4.66",