From 2d59ba902ede3f1ff77eeffd80d08cb2f6cb43f2 Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 10:23:19 +0100 Subject: [PATCH 1/8] Add the install_requires automatically --- setup.py | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 03ad42dc..6b72ce6d 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,12 @@ def run(self): setup( name='snmachine', + author='Michelle Lochner', + author_email='dr.michelle.lochner@gmail.com', + description='Machine learning code for photometric supernova ' + 'classification', + url='https://github.com/LSSTDESC/snmachine', + license='BSD-3-Clause License', use_scm_version={ "root": ".", "relative_to": __file__, @@ -50,10 +56,32 @@ def run(self): 'example_data/example_data_for_tests.pckl']}, exclude_package_data={'utils': ['archive/*']}, cmdclass={'install': ExtractExampleData}, - url='https://github.com/LSSTDESC/snmachine', - license='BSD-3-Clause License', - author='Michelle Lochner', - author_email='dr.michelle.lochner@gmail.com', - description='Machine learning code for photometric supernova ' - 'classification' + install_requires=['astropy>=1.1.2', + 'jupyter>=1.0.0', + 'matplotlib>=1.5.1', + 'numpy>=1.18.4', + 'scikit-learn=0.20.0', + 'scipy>=0.17.0', + 'george>=0.3.0', + 'iminuit==1.2', + 'pandas>=0.23.0', + 'extinction>=0.3.0', + 'imbalanced-learn>=0.4.3', + 'python=3.7', + 'pip>=20.1', + 'emcee>=2.1.0', + 'numpydoc>=0.6.0', + 'pytest-remotedata>=0.3.1', + 'pywavelets>=0.4.0', + 'sncosmo==2.1.0', + 'nose>=1.3.7', + 'future>=0.16', + 'pyyaml>=3.13', + 'pytest-xdist>=1.26.1', + 'seaborn', + 'schwimmbad', + 'cesium', + 'tqdm', + 'lightgbm' + ] ) From 2c72e266419e963a2ef4372fff9ad2770d787a5f Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 10:36:30 +0100 Subject: [PATCH 2/8] Minor change --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6b72ce6d..791fa2ce 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ def run(self): 'jupyter>=1.0.0', 'matplotlib>=1.5.1', 'numpy>=1.18.4', - 'scikit-learn=0.20.0', + 'scikit-learn=0.20.0', 'scipy>=0.17.0', 'george>=0.3.0', 'iminuit==1.2', From bda3d8f67a6e20c927dbd4d9ac296ed732ab4994 Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 10:45:33 +0100 Subject: [PATCH 3/8] Minor changes --- setup.py | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/setup.py b/setup.py index 791fa2ce..f149fab2 100644 --- a/setup.py +++ b/setup.py @@ -56,32 +56,31 @@ def run(self): 'example_data/example_data_for_tests.pckl']}, exclude_package_data={'utils': ['archive/*']}, cmdclass={'install': ExtractExampleData}, - install_requires=['astropy>=1.1.2', - 'jupyter>=1.0.0', - 'matplotlib>=1.5.1', - 'numpy>=1.18.4', + install_requires=['astropy>=1.1.2', + 'jupyter>=1.0.0', + 'matplotlib>=1.5.1', + 'numpy>=1.18.4', 'scikit-learn=0.20.0', - 'scipy>=0.17.0', - 'george>=0.3.0', - 'iminuit==1.2', - 'pandas>=0.23.0', - 'extinction>=0.3.0', - 'imbalanced-learn>=0.4.3', - 'python=3.7', - 'pip>=20.1', - 'emcee>=2.1.0', - 'numpydoc>=0.6.0', - 'pytest-remotedata>=0.3.1', - 'pywavelets>=0.4.0', - 'sncosmo==2.1.0', - 'nose>=1.3.7', - 'future>=0.16', - 'pyyaml>=3.13', - 'pytest-xdist>=1.26.1', - 'seaborn', - 'schwimmbad', - 'cesium', - 'tqdm', - 'lightgbm' - ] + 'scipy>=0.17.0', + 'george>=0.3.0', + 'iminuit==1.2', + 'pandas>=0.23.0', + 'extinction>=0.3.0', + 'imbalanced-learn>=0.4.3', + 'python=3.7', + 'pip>=20.1', + 'emcee>=2.1.0', + 'numpydoc>=0.6.0', + 'pytest-remotedata>=0.3.1', + 'pywavelets>=0.4.0', + 'sncosmo==2.1.0', + 'nose>=1.3.7', + 'future>=0.16', + 'pyyaml>=3.13', + 'pytest-xdist>=1.26.1', + 'seaborn', + 'schwimmbad', + 'cesium', + 'tqdm', + 'lightgbm'] ) From 2be8bdee0fda1b492933476c24a1f8e83be80fb9 Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 10:46:37 +0100 Subject: [PATCH 4/8] Only some packages --- setup.py | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/setup.py b/setup.py index f149fab2..fcf98ac5 100644 --- a/setup.py +++ b/setup.py @@ -59,28 +59,5 @@ def run(self): install_requires=['astropy>=1.1.2', 'jupyter>=1.0.0', 'matplotlib>=1.5.1', - 'numpy>=1.18.4', - 'scikit-learn=0.20.0', - 'scipy>=0.17.0', - 'george>=0.3.0', - 'iminuit==1.2', - 'pandas>=0.23.0', - 'extinction>=0.3.0', - 'imbalanced-learn>=0.4.3', - 'python=3.7', - 'pip>=20.1', - 'emcee>=2.1.0', - 'numpydoc>=0.6.0', - 'pytest-remotedata>=0.3.1', - 'pywavelets>=0.4.0', - 'sncosmo==2.1.0', - 'nose>=1.3.7', - 'future>=0.16', - 'pyyaml>=3.13', - 'pytest-xdist>=1.26.1', - 'seaborn', - 'schwimmbad', - 'cesium', - 'tqdm', - 'lightgbm'] + 'numpy>=1.18.4'] ) From 18cbf67154a1184e4f73388170a135e678f9a23c Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 10:54:43 +0100 Subject: [PATCH 5/8] Add more packages --- setup.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fcf98ac5..b0fa5d08 100644 --- a/setup.py +++ b/setup.py @@ -59,5 +59,27 @@ def run(self): install_requires=['astropy>=1.1.2', 'jupyter>=1.0.0', 'matplotlib>=1.5.1', - 'numpy>=1.18.4'] -) + 'numpy>=1.18.4', + 'scipy>=0.17.0', + 'george>=0.3.0', + 'iminuit==1.2', + 'pandas>=0.23.0', + 'extinction>=0.3.0', + 'imbalanced-learn>=0.4.3', + 'python=3.7', + 'pip>=20.1', + 'emcee>=2.1.0', + 'numpydoc>=0.6.0', + 'pytest-remotedata>=0.3.1', + 'pywavelets>=0.4.0', + 'sncosmo==2.1.0', + 'nose>=1.3.7', + 'future>=0.16', + 'pyyaml>=3.13', + 'pytest-xdist>=1.26.1', + 'seaborn', + 'schwimmbad', + 'cesium', + 'tqdm', + 'lightgbm'] +) \ No newline at end of file From 8d923856b6f7f27b3de0a65c5db32c17cc164aa8 Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Tue, 31 Aug 2021 11:00:35 +0100 Subject: [PATCH 6/8] Fix installs --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b0fa5d08..6731654a 100644 --- a/setup.py +++ b/setup.py @@ -60,13 +60,14 @@ def run(self): 'jupyter>=1.0.0', 'matplotlib>=1.5.1', 'numpy>=1.18.4', + 'scikit-learn==0.20.0', 'scipy>=0.17.0', 'george>=0.3.0', 'iminuit==1.2', 'pandas>=0.23.0', 'extinction>=0.3.0', 'imbalanced-learn>=0.4.3', - 'python=3.7', + 'python>=3.7', 'pip>=20.1', 'emcee>=2.1.0', 'numpydoc>=0.6.0', From f0c5a49720e666af548a7d759a72488fd6820697 Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Fri, 3 Sep 2021 19:00:51 +0100 Subject: [PATCH 7/8] Add and modify the required files --- requirements.txt | 19 +++++++++++++++++++ setup.py | 17 +++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..d6a73dec --- /dev/null +++ b/requirements.txt @@ -0,0 +1,19 @@ +###### Requirements without Version Specifiers ###### +iminuit +seaborn +lightgbm +setuptools_scm + +###### Requirements with Version Specifiers ###### +astropy>=1.1.2 +matplotlib>=1.5.1 +numpy>=1.18.4 +scikit-learn==0.20.0 +scipy>=0.17.0 +george>=0.3.0 +pandas>=0.23.0 +pywavelets>=0.4.0 +sncosmo==2.1.0 +nose>=1.3.7 +future>=0.16 +pyyaml>=3.13 \ No newline at end of file diff --git a/setup.py b/setup.py index 6731654a..1987fa02 100644 --- a/setup.py +++ b/setup.py @@ -57,30 +57,19 @@ def run(self): exclude_package_data={'utils': ['archive/*']}, cmdclass={'install': ExtractExampleData}, install_requires=['astropy>=1.1.2', - 'jupyter>=1.0.0', 'matplotlib>=1.5.1', 'numpy>=1.18.4', 'scikit-learn==0.20.0', 'scipy>=0.17.0', 'george>=0.3.0', - 'iminuit==1.2', + 'iminuit', 'pandas>=0.23.0', - 'extinction>=0.3.0', - 'imbalanced-learn>=0.4.3', - 'python>=3.7', - 'pip>=20.1', - 'emcee>=2.1.0', - 'numpydoc>=0.6.0', - 'pytest-remotedata>=0.3.1', 'pywavelets>=0.4.0', 'sncosmo==2.1.0', 'nose>=1.3.7', 'future>=0.16', 'pyyaml>=3.13', - 'pytest-xdist>=1.26.1', 'seaborn', - 'schwimmbad', - 'cesium', - 'tqdm', - 'lightgbm'] + 'lightgbm', + "setuptools_scm"] ) \ No newline at end of file From 573df7633239b1dc9625ccbc700fec14c95d0bfc Mon Sep 17 00:00:00 2001 From: Catarina Alves Date: Fri, 3 Sep 2021 19:37:31 +0100 Subject: [PATCH 8/8] Remove the version requirement from scikit-learn --- requirements.txt | 16 ++++++++-------- setup.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index d6a73dec..cc298b01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,19 @@ ###### Requirements without Version Specifiers ###### iminuit -seaborn lightgbm +scikit-learn +seaborn setuptools_scm ###### Requirements with Version Specifiers ###### astropy>=1.1.2 +future>=0.16 +george>=0.3.0 matplotlib>=1.5.1 +nose>=1.3.7 numpy>=1.18.4 -scikit-learn==0.20.0 -scipy>=0.17.0 -george>=0.3.0 pandas>=0.23.0 +pyyaml>=3.13 pywavelets>=0.4.0 -sncosmo==2.1.0 -nose>=1.3.7 -future>=0.16 -pyyaml>=3.13 \ No newline at end of file +scipy>=0.17.0 +sncosmo==2.1.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 1987fa02..59b0f85a 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def run(self): install_requires=['astropy>=1.1.2', 'matplotlib>=1.5.1', 'numpy>=1.18.4', - 'scikit-learn==0.20.0', + 'scikit-learn', 'scipy>=0.17.0', 'george>=0.3.0', 'iminuit', @@ -71,5 +71,5 @@ def run(self): 'pyyaml>=3.13', 'seaborn', 'lightgbm', - "setuptools_scm"] -) \ No newline at end of file + 'setuptools_scm'] +)