From 970b692cf1dcb8e454e298e93f10001eadf3025d Mon Sep 17 00:00:00 2001 From: Janosh Riebesell Date: Fri, 16 Apr 2021 16:02:31 +0200 Subject: [PATCH 1/3] change deps versions from == to >= --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3c1198a6..7a2daf73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ # Direct requirements of this project alone -matminer==0.6.2 -pymatgen==2020.01.28 -tpot==0.11.0 -skrebate==0.6 -pyyaml==5.1.2 -scikit-learn==0.22.2 +matminer>=0.6.2 +pymatgen>=2020.01.28 +tpot>=0.11.0 +skrebate>=0.6 +pyyaml>=5.1.2 +scikit-learn>=0.22.2 # Also requirements of matminer # numpy # pandas # scikit_learn -# pymatgen \ No newline at end of file +# pymatgen From be5f460a92a041acaeab6efa7e0ceefcb6b40e61 Mon Sep 17 00:00:00 2001 From: Janosh Riebesell Date: Fri, 16 Apr 2021 16:05:30 +0200 Subject: [PATCH 2/3] simplify reqs parsing in setup.py --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index af180566..ca271acf 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,7 @@ import os module_dir = os.path.dirname(os.path.abspath(__file__)) -reqs_raw = open(os.path.join(module_dir, "requirements.txt")).read() -# reqs_list = [r.replace("==", ">=") for r in reqs_raw.split("\n")] -reqs_list = [r for r in reqs_raw.split("\n")] +reqs_raw = open(os.path.join(module_dir, "requirements.txt")).read().split("\n") # Version is MAJOR.MINOR.PATCH.YYYYMMDD version = "1.0.3.20200727" From c8597c92c2388a312d3a0e9cf276e97be7ffb484 Mon Sep 17 00:00:00 2001 From: Janosh Riebesell Date: Fri, 7 May 2021 07:12:50 +0200 Subject: [PATCH 3/3] fix undefined reqs_list in setup.py --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index ca271acf..51b5d5cd 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ -from setuptools import setup, find_packages import os +from setuptools import find_packages, setup + module_dir = os.path.dirname(os.path.abspath(__file__)) -reqs_raw = open(os.path.join(module_dir, "requirements.txt")).read().split("\n") +install_reqs = open(os.path.join(module_dir, "requirements.txt")).read().split("\n") # Version is MAJOR.MINOR.PATCH.YYYYMMDD version = "1.0.3.20200727" @@ -22,7 +23,7 @@ packages=find_packages(where=".", exclude=("benchdev", "benchdev.*")), package_data={}, zip_safe=False, - install_requires=reqs_list, + install_requires=install_reqs, extras_require={}, classifiers=['Programming Language :: Python :: 3.6', 'Development Status :: 4 - Beta',