From c5651b1bb93c83131256c11e673245e7ca33c6e8 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Fri, 3 May 2019 13:26:06 +0100 Subject: [PATCH 1/7] Add all the dependancies from requirements.txt to setup.cfg --- setup.cfg | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5e035eeac..a642b17ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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, emcee, corner diff --git a/setup.py b/setup.py index 5547de6d8..5e5cb1f09 100755 --- a/setup.py +++ b/setup.py @@ -101,7 +101,7 @@ version=VERSION, description=DESCRIPTION, scripts=scripts, - install_requires=['astropy'], + install_requires=[s.strip() for s in metadata.get('install_requires', 'astropy').split(',')], author=AUTHOR, author_email=AUTHOR_EMAIL, license=LICENSE, From 9f55c4920ecf8a134c221ba1da0801b427fe8cb9 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Fri, 3 May 2019 13:30:40 +0100 Subject: [PATCH 2/7] Recommed using pip install -e for development version --- docs/install.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/install.rst b/docs/install.rst index 8b66156e7..b5cee4331 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -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 ./ .. _testsuite: From 33ffbb13039e114e404321ef33a4723014335e67 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Fri, 3 May 2019 13:31:01 +0100 Subject: [PATCH 3/7] drop requrements.txt so there is only one source of dependancies --- requirements.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9221f0023..000000000 --- a/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -six -numpy>=1.11.0 -scipy>=0.18.0 -matplotlib>=1.3 -emcee -corner From c621a0a33188f66a6123df6b61a704acc5cc6371 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Sun, 9 Jun 2019 12:12:28 -0500 Subject: [PATCH 4/7] don't install emcee or corner by default --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index a642b17ff..b19e29f7d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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, emcee, corner +install_requires = astropy, six, numpy>=1.11.0, scipy>=0.18.0, matplotlib>=1.3 From fba0521ee2b71557c5c9c3f66f9a1a7cf46132b7 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 10 Jun 2019 15:42:40 -0500 Subject: [PATCH 5/7] Add an extra for modeling --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 5e5cb1f09..e7b828d89 100755 --- a/setup.py +++ b/setup.py @@ -102,6 +102,7 @@ description=DESCRIPTION, scripts=scripts, 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, From c82f9e71b9801912138089017efae59c7102e156 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 10 Jun 2019 15:42:50 -0500 Subject: [PATCH 6/7] Trim the build time dependancies --- pyproject.toml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e2531e4b9..c5d4c8888 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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"] From 55cb85d461c58a5a5d13799c2ecbd48efb9b551b Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 10 Jun 2019 16:22:35 -0500 Subject: [PATCH 7/7] update docs again --- docs/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.rst b/docs/install.rst index b5cee4331..5988c6f30 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -44,7 +44,7 @@ dependencies: :: Finally, install ``stingray`` itself: :: - $ pip install -e ./ + $ pip install -e ".[modeling]" .. _testsuite: