From 241b5ccfc38a93cc01f1950408d518dd1d846058 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 7 Nov 2023 17:30:13 -0700 Subject: [PATCH 1/5] be more strict with dependency versions --- setup.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/setup.py b/setup.py index f2d19a13..9b40ac66 100644 --- a/setup.py +++ b/setup.py @@ -27,33 +27,33 @@ version = version.splitlines()[1].split()[2].strip('"').strip("'") test_requires = [ - "backports.tempfile>=1.0", - "pytest>=7.0.1", - "pytest-cov>=4.0.0", - "sphinx-rtd-theme>=1.1.1", - "nbsphinx>=0.8.10", - "sphinxcontrib-napoleon>=0.7", - "ghp-import>=2.1.0", + "backports.tempfile~=1.0", + "pytest~=7.4", + "pytest-cov~=4.0", + "sphinx-rtd-theme~=1.1", + "nbsphinx~=0.8", + "sphinxcontrib-napoleon~=0.7", + "ghp-import~=2.1", ] -numpy_dependency = "numpy>=1.20.0" +numpy_dependency = "numpy~=1.20" extras_requires = [ - "lxml>=4.9.1", - "pandas", - "scipy>=1.7.3", + "lxml~=4.9", + "pandas~=2.0", + "scipy~=1.7", numpy_dependency, - "XlsxWriter>=3.0.3", + "XlsxWriter~=3.0", ] -opendss_requires = ["OpenDSSDirect.py>=0.7.0", "pandas", numpy_dependency] -dew_requires = [numpy_dependency, "xlrd>=2.0.1"] -gridlabd_requires = ["croniter>=1.3.7", numpy_dependency] +opendss_requires = ["OpenDSSDirect.py~=0.7", "pandas", numpy_dependency] +dew_requires = [numpy_dependency, "xlrd~=2.0"] +gridlabd_requires = ["croniter~=1.3", numpy_dependency] cyme_requires = [numpy_dependency] ephasor_requires = [numpy_dependency, "pandas"] synergi_requires = [ numpy_dependency, - "pandas_access>=0.0.1", + "pandas_access~=0.0", ] # Need pandas_access to convert the MDB tables to Pandas DataFrame windmil_requires = ["bokeh", "xmltodict"] @@ -117,12 +117,12 @@ def run(self): ], test_suite="tests", install_requires=[ - "click>=8.0.4", - "future>=0.18.2", - "networkx>=2.5.1", - "six>=1.16.0", - "traitlets>=5.1.1", - "json_tricks>=3.16.1", + "click~=8.0", + "future~=0.18", + "networkx~=2.5", + "six~=1.16", + "traitlets~=5.1,<5.10", + "json_tricks~=3.16", "pandas", numpy_dependency, ], From a9465d967f6c6df4b6b8d3a0047e7d24f6cf4522 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 7 Nov 2023 17:55:49 -0700 Subject: [PATCH 2/5] maintain support for python3.7 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9b40ac66..59eb5742 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ extras_requires = [ "lxml~=4.9", - "pandas~=2.0", + "pandas~=1.3.5", # Pyton 3.7 does not support pandas 1.4 "scipy~=1.7", numpy_dependency, "XlsxWriter~=3.0", @@ -123,7 +123,7 @@ def run(self): "six~=1.16", "traitlets~=5.1,<5.10", "json_tricks~=3.16", - "pandas", + "pandas~=1.3.5", numpy_dependency, ], extras_require={ From 5a1b3b2d380399b41c96911f983bb7fac5bce069 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 7 Nov 2023 17:30:13 -0700 Subject: [PATCH 3/5] be more strict with dependency versions --- setup.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/setup.py b/setup.py index f2d19a13..9b40ac66 100644 --- a/setup.py +++ b/setup.py @@ -27,33 +27,33 @@ version = version.splitlines()[1].split()[2].strip('"').strip("'") test_requires = [ - "backports.tempfile>=1.0", - "pytest>=7.0.1", - "pytest-cov>=4.0.0", - "sphinx-rtd-theme>=1.1.1", - "nbsphinx>=0.8.10", - "sphinxcontrib-napoleon>=0.7", - "ghp-import>=2.1.0", + "backports.tempfile~=1.0", + "pytest~=7.4", + "pytest-cov~=4.0", + "sphinx-rtd-theme~=1.1", + "nbsphinx~=0.8", + "sphinxcontrib-napoleon~=0.7", + "ghp-import~=2.1", ] -numpy_dependency = "numpy>=1.20.0" +numpy_dependency = "numpy~=1.20" extras_requires = [ - "lxml>=4.9.1", - "pandas", - "scipy>=1.7.3", + "lxml~=4.9", + "pandas~=2.0", + "scipy~=1.7", numpy_dependency, - "XlsxWriter>=3.0.3", + "XlsxWriter~=3.0", ] -opendss_requires = ["OpenDSSDirect.py>=0.7.0", "pandas", numpy_dependency] -dew_requires = [numpy_dependency, "xlrd>=2.0.1"] -gridlabd_requires = ["croniter>=1.3.7", numpy_dependency] +opendss_requires = ["OpenDSSDirect.py~=0.7", "pandas", numpy_dependency] +dew_requires = [numpy_dependency, "xlrd~=2.0"] +gridlabd_requires = ["croniter~=1.3", numpy_dependency] cyme_requires = [numpy_dependency] ephasor_requires = [numpy_dependency, "pandas"] synergi_requires = [ numpy_dependency, - "pandas_access>=0.0.1", + "pandas_access~=0.0", ] # Need pandas_access to convert the MDB tables to Pandas DataFrame windmil_requires = ["bokeh", "xmltodict"] @@ -117,12 +117,12 @@ def run(self): ], test_suite="tests", install_requires=[ - "click>=8.0.4", - "future>=0.18.2", - "networkx>=2.5.1", - "six>=1.16.0", - "traitlets>=5.1.1", - "json_tricks>=3.16.1", + "click~=8.0", + "future~=0.18", + "networkx~=2.5", + "six~=1.16", + "traitlets~=5.1,<5.10", + "json_tricks~=3.16", "pandas", numpy_dependency, ], From 8817ab41a28f4945b6feaabac6b93ed1b25c4dda Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 7 Nov 2023 17:55:49 -0700 Subject: [PATCH 4/5] maintain support for python3.7 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9b40ac66..59eb5742 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ extras_requires = [ "lxml~=4.9", - "pandas~=2.0", + "pandas~=1.3.5", # Pyton 3.7 does not support pandas 1.4 "scipy~=1.7", numpy_dependency, "XlsxWriter~=3.0", @@ -123,7 +123,7 @@ def run(self): "six~=1.16", "traitlets~=5.1,<5.10", "json_tricks~=3.16", - "pandas", + "pandas~=1.3.5", numpy_dependency, ], extras_require={ From ae4d17556d35ea5297ab9533ec723b181af63b44 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Fri, 17 Nov 2023 12:04:52 -0600 Subject: [PATCH 5/5] remove traitlets version upper bound - unnecessary because of #429 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 59eb5742..2812d9c9 100644 --- a/setup.py +++ b/setup.py @@ -121,7 +121,7 @@ def run(self): "future~=0.18", "networkx~=2.5", "six~=1.16", - "traitlets~=5.1,<5.10", + "traitlets~=5.1", "json_tricks~=3.16", "pandas~=1.3.5", numpy_dependency,