From ba7c93093575f1d221569deba9b6acd995263f78 Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Wed, 4 Oct 2023 10:51:17 +0100 Subject: [PATCH 1/2] Lock numpy and scipy versions to avoid build crash --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 39ab315a9f..efb2804e67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,8 @@ mkdocs-material>=4.6.3 mkdocs-git-revision-date-localized-plugin >= 1.2 mkdocs-glightbox >= 0.3.4 pymdown-extensions>=6.3 -numpy>=1.19.0,<=1.21.5 -scipy>=0.19.1 +numpy>=1.19.0,!=1.22,!=1.24,>=1.23.0 +scipy>=0.19.1,<1.11 matplotlib>=2.1.1 pillow>=5.1.0 Markdown>=3.2.2,<3.4 diff --git a/setup.py b/setup.py index 983ae4e171..fbc91d857e 100644 --- a/setup.py +++ b/setup.py @@ -35,8 +35,8 @@ }, "test_suite": "pytest", "install_requires": [ - "numpy>=1.19.0,<1.22.1", - "scipy>=0.19.1", + "numpy>=1.19.0,!=1.22,!=1.24,>=1.23.0", + "scipy>=0.19.1,<1.11", "importlib-resources ; python_version<'3.9'", "pandas", "tables", From 3998d8f6f73568825e3844e2ab5e5d765bad48ac Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Wed, 4 Oct 2023 11:50:44 +0100 Subject: [PATCH 2/2] Lock cvxpy version instead of scipy --- requirements.txt | 3 ++- setup.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index efb2804e67..81b000339d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ mkdocs-git-revision-date-localized-plugin >= 1.2 mkdocs-glightbox >= 0.3.4 pymdown-extensions>=6.3 numpy>=1.19.0,!=1.22,!=1.24,>=1.23.0 -scipy>=0.19.1,<1.11 +scipy>=0.19.1 matplotlib>=2.1.1 pillow>=5.1.0 Markdown>=3.2.2,<3.4 @@ -21,3 +21,4 @@ mkdocstrings==0.18.0 PyVMCON>=2.1.0,<3.0.0 CoolProp>=6.4 Jinja2>=3.0 +cvxpy!=1.3.0,!=1.3.1 diff --git a/setup.py b/setup.py index fbc91d857e..c02f45d227 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,8 @@ "test_suite": "pytest", "install_requires": [ "numpy>=1.19.0,!=1.22,!=1.24,>=1.23.0", - "scipy>=0.19.1,<1.11", + "scipy>=0.19.1", + "cvxpy!=1.3.0,!=1.3.1", "importlib-resources ; python_version<'3.9'", "pandas", "tables",