Skip to content

Commit

Permalink
Merge pull request #254 from mkelley/fix-setup-cfg
Browse files Browse the repository at this point in the history
Fix requirements and setup.py
mkelley authored Apr 27, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 3d4857b + ffd86f2 commit 8001ae3
Showing 5 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ care of with installation using pip:
* `numpy <https://www.numpy.org/>`__ 1.13.0 or later
* pytest 3.1 or later
* `astropy <https://www.astropy.org/>`__
* `astroquery <https://astroquery.readthedocs.io/en/latest/>`__ 0.3.9.dev5089 or later: For retrieval of online data, e.g., ephemerides and orbits.
* `astroquery <https://astroquery.readthedocs.io/en/latest/>`__ 0.4.1.dev5892 or later: For retrieval of online data, e.g., ephemerides and orbits.
* `scipy <https://scipy.org/>`__: For numerical integrations in `sbpy.activity.gas` and `sbpy.photometry`, among others.
* `synphot <https://github.com/spacetelescope/synphot_refactor>`__ 0.1.3 or later: For calibration with respect to the Sun and Vega, filtering spectra through bandpasses.
* `ginga <https://ejeschke.github.io/ginga/>`__ and `photutils <https://photutils.readthedocs.io/en/stable/>`__: To interactively enhance images of comets with the `~sbpy.imageanalysis.CometaryEnhancement` Ginga plugin.
10 changes: 10 additions & 0 deletions pip-requirements
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# The pip-requirements file should no longer be used. Instead, to install
# sbpy along with its dependencies, you can use:
#
# pip install .
#
# to install only the minimal dependencies, or e.g.:
#
# pip install .[all]
#
# to install all optional dependencies.
6 changes: 0 additions & 6 deletions requirements.txt

This file was deleted.

12 changes: 10 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -32,14 +32,22 @@ license = BSD 3-Clause
url = https://sbpy.org
edit_on_github = False
github_project = NASA-Planetary-Science/sbpy

[options]
install_requires =
numpy>=1.13.0
astropy>=3.0<4.0
astropy>=3.0,<4.0
astropy-helpers
matplotlib
ads
synphot<0.2
astroquery>=0.4
astroquery>=0.4.1.dev0

[options.extras_require] =
all =
scipy
ginga
photutils

[pycodestyle]
select = E101,E111,E112,E113,E124,E201,E202,E203,E211,E221,E225,E231,E241,E251,E261,E265,E271,E272,E301,E302,E303,E305,E502,E703,E711,E712,E714,E722,E901,E902,W191,W291,W292,W293,W391
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -140,8 +140,7 @@
version=VERSION,
description=DESCRIPTION,
scripts=scripts,
install_requires=metadata.get(
'install_requires', 'astropy').strip().split(','),
install_requires=metadata.get('install_requires'),
python_requires='>=3.6',
include_package_data=True,
author=AUTHOR,

0 comments on commit 8001ae3

Please sign in to comment.