From 674fe891e735c432816156e673769bc0a4ec99de Mon Sep 17 00:00:00 2001 From: ssolson Date: Thu, 27 Jun 2024 08:06:50 -0600 Subject: [PATCH 1/4] no np 2.0 --- environment.yml | 4 ++-- requirements.txt | 4 ++-- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/environment.yml b/environment.yml index 14d3ca42a..862b7d706 100644 --- a/environment.yml +++ b/environment.yml @@ -6,8 +6,8 @@ dependencies: - python>=3.8,<3.12 - pip - pandas>=1.0.0 - - numpy>=1.21.0 - - scipy + - numpy>=1.21.0, <2.0.0 + - scipy<=1.13.1 - matplotlib - requests - lxml diff --git a/requirements.txt b/requirements.txt index 59fc7f8b9..9d1d9a7d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pandas>=1.0.0 -numpy>=1.21.0 -scipy +numpy>=1.21.0, <2.0.0 +scipy<=1.13.1 matplotlib requests pecos>=0.3.0 diff --git a/setup.py b/setup.py index 1c62eca5e..b27be0b19 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ ] DEPENDENCIES = [ "pandas>=1.0.0", - "numpy>=1.21.0", - "scipy", + "numpy>=1.21.0, <2.0.0", + "scipy<=1.13.1", "matplotlib", "requests", "pecos>=0.3.0", From 48bec4c8b9782879d139068fd5947d128f1a16bf Mon Sep 17 00:00:00 2001 From: ssolson Date: Thu, 27 Jun 2024 08:50:25 -0600 Subject: [PATCH 2/4] v0.8.1 --- mhkit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhkit/__init__.py b/mhkit/__init__.py index f4c919a76..82283fec3 100644 --- a/mhkit/__init__.py +++ b/mhkit/__init__.py @@ -17,7 +17,7 @@ # Ignore future warnings _warn.simplefilter(action="ignore", category=FutureWarning) -__version__ = "v0.8.0" +__version__ = "v0.8.1" __copyright__ = """ Copyright 2019, Alliance for Sustainable Energy, LLC under the terms of From d8536b94833f707a135c9143405383880c5bf73b Mon Sep 17 00:00:00 2001 From: ssolson Date: Thu, 27 Jun 2024 08:50:45 -0600 Subject: [PATCH 3/4] fix python versions description --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b27be0b19..5fece9afe 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ Installation ------------------------ -MHKiT-Python requires Python (3.7, 3.8, or 3.9) along with several Python +MHKiT-Python requires Python (3.8, 3.9, 3.10, or 3.11) along with several Python package dependencies. MHKiT-Python can be installed from PyPI using the command ``pip install mhkit``. See [installation instructions](https://mhkit-software.github.io/MHKiT/installation.html) for more information. From 6d96a1aeccbdb3a3e60827c7884fbbd305bef39a Mon Sep 17 00:00:00 2001 From: ssolson Date: Thu, 27 Jun 2024 21:40:09 -0600 Subject: [PATCH 4/4] netcdf <=1.6.5 --- environment.yml | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 862b7d706..ac679176d 100644 --- a/environment.yml +++ b/environment.yml @@ -17,7 +17,7 @@ dependencies: - beautifulsoup4 - xarray - h5py>=3.6.0 - - netcdf4>=1.5.8 + - netcdf4>=1.5.8, <=1.6.5 - pip: - pecos>=0.3.0 - fatpack diff --git a/requirements.txt b/requirements.txt index 9d1d9a7d6..381f1068f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ NREL-rex>=0.2.63 six>=1.13.0 h5py>=3.6.0 h5pyd>=0.7.0 -netCDF4>=1.5.8 +netCDF4>=1.5.8, <=1.6.5 xarray statsmodels bottleneck diff --git a/setup.py b/setup.py index 5fece9afe..c30ff2e9f 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ "six>=1.13.0", "h5py>=3.6.0", "h5pyd >=0.7.0", - "netCDF4", + "netCDF4>=1.5.8, <=1.6.5", "xarray", "statsmodels", "pytz",