Skip to content

Commit

Permalink
Merge pull request #397 from Cadair/pip_dependancies
Browse files Browse the repository at this point in the history
Unify dependencies into setup.cfg
  • Loading branch information
dhuppenkothen authored Jun 10, 2019
2 parents d46bd9a + 55cb85d commit a5e9830
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 21 deletions.
3 changes: 1 addition & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ Now ``cd`` into the newly created ``stingray`` directory and install the necessa
dependencies: ::

$ cd stingray
$ pip install -r requirements.txt

Finally, install ``stingray`` itself: ::

$ python setup.py install
$ pip install -e ".[modeling]"

.. _testsuite:

Expand Down
12 changes: 1 addition & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
[build-system]
requires = [
"wheel",
"setuptools",
"six",
"numpy>=1.11.0",
"scipy>=0.18.0",
"matplotlib>=1.3",
"emcee",
"corner",
"astropy",
]
requires = ["wheel", "setuptools", "numpy==1.14.5"]
6 changes: 0 additions & 6 deletions requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ license = MIT
url = https://github.com/StingraySoftware/stingray
edit_on_github = False
github_project = StingraySoftware/stingray

install_requires = astropy, six, numpy>=1.11.0, scipy>=0.18.0, matplotlib>=1.3
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@
version=VERSION,
description=DESCRIPTION,
scripts=scripts,
install_requires=['astropy'],
install_requires=[s.strip() for s in metadata.get('install_requires', 'astropy').split(',')],
extras_require={'modeling': ['emcee', 'corner', 'statsmodels']},
author=AUTHOR,
author_email=AUTHOR_EMAIL,
license=LICENSE,
Expand Down

0 comments on commit a5e9830

Please sign in to comment.