Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated requirements for imported packages #160

Merged
merged 3 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/160.trivial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added the explicitly imported packages to the install requirements.
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[build-system]
requires = [
"extension-helpers",
"oldest-supported-numpy",
"setuptools>=56,!=61.0.0",
"setuptools_scm[toml]>=6.2",
"setuptools",
"setuptools_scm[toml]",
"wheel",
]
build-backend = 'setuptools.build_meta'
Expand Down
6 changes: 5 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@ include_package_data = True
setup_requires =
setuptools_scm
install_requires =
astropy>=5.0.1
numpy>=1.21.0
matplotlib>=3.5.0
scipy>=1.6.0
scikit-image>=0.19.0
sunpy>=5.0.0

[options.extras_require]
dask =
dask[array]>=2021.4.0
tests =
dask
pytest-astropy
pytest-mpl
docs =
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from pathlib import Path
from itertools import chain

from extension_helpers import get_extensions

try:
# Recommended for setuptools 61.0.0+
# (though may disappear in the future)
Expand All @@ -29,5 +27,4 @@
setup(
extras_require=extras,
use_scm_version={"write_to": Path("sunkit_image") / "_version.py"},
ext_modules=get_extensions(),
)
13 changes: 8 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ deps =
pytest-cov
pytest-xdist
extras =
all
tests
commands =
!figure: pip freeze --all --no-input
Expand All @@ -60,7 +61,9 @@ commands =
[testenv:build_docs]
changedir = docs
description = Invoke sphinx-build to build the HTML docs
extras = docs
extras =
all
docs
commands =
pip uninstall -y pytest
pip freeze --all --no-input
Expand All @@ -84,11 +87,11 @@ pypi_filter =
extras =
deps =
conda_deps =
extension-helpers
dask
pytest-astropy
pytest-mpl
astropy
matplotlib
numpy
scikit-image
scipy
sunpy
conda_channels = conda-forge
install_command = pip install --no-deps {opts} {packages}
Expand Down