From 0e80c9256698d88bdc2eb3d846d02b797e298658 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:05:12 +0100 Subject: [PATCH 1/6] pin setuptools to < 60.0 --- legacy_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy_setup.py b/legacy_setup.py index 76b31d0..2033e77 100644 --- a/legacy_setup.py +++ b/legacy_setup.py @@ -297,7 +297,7 @@ def install_scs(**kwargs): packages=["scs"], ext_modules=ext_modules, cmdclass={"build_ext": build_ext_scs}, - setup_requires=["numpy >= 1.7"], + setup_requires=["numpy >= 1.7, setuptools < 60.0"], install_requires=["numpy >= 1.7", "scipy >= 0.13.2"], license="MIT", zip_safe=False, From ec59e583b97a8a482b921244ee76e8346104d865 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:16:58 +0100 Subject: [PATCH 2/6] typo --- legacy_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy_setup.py b/legacy_setup.py index 2033e77..68f681a 100644 --- a/legacy_setup.py +++ b/legacy_setup.py @@ -297,7 +297,7 @@ def install_scs(**kwargs): packages=["scs"], ext_modules=ext_modules, cmdclass={"build_ext": build_ext_scs}, - setup_requires=["numpy >= 1.7, setuptools < 60.0"], + setup_requires=["numpy >= 1.7", "setuptools < 60.0"], install_requires=["numpy >= 1.7", "scipy >= 0.13.2"], license="MIT", zip_safe=False, From 932124b06799634f8e252ea1068e73e01de56b23 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:26:09 +0100 Subject: [PATCH 3/6] try again --- legacy_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy_setup.py b/legacy_setup.py index 68f681a..ebdb5e0 100644 --- a/legacy_setup.py +++ b/legacy_setup.py @@ -298,7 +298,7 @@ def install_scs(**kwargs): ext_modules=ext_modules, cmdclass={"build_ext": build_ext_scs}, setup_requires=["numpy >= 1.7", "setuptools < 60.0"], - install_requires=["numpy >= 1.7", "scipy >= 0.13.2"], + install_requires=["numpy >= 1.7", "scipy >= 0.13.2", "setuptools < 60.0"], license="MIT", zip_safe=False, # TODO: update this: From 89678ebdfe9435d40eb95b12ca8662f4d6404e8c Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:42:13 +0100 Subject: [PATCH 4/6] change conda setuptools --- .github/workflows/build.yml | 2 +- legacy_setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a799ba..50dacff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: channels: conda-forge,anaconda - name: Install dependencies run: | - conda install scipy numpy pytest + conda install scipy numpy pytest 'setuptools<=60' - name: Test run: | python legacy_setup.py install --scs --openmp diff --git a/legacy_setup.py b/legacy_setup.py index ebdb5e0..76b31d0 100644 --- a/legacy_setup.py +++ b/legacy_setup.py @@ -297,8 +297,8 @@ def install_scs(**kwargs): packages=["scs"], ext_modules=ext_modules, cmdclass={"build_ext": build_ext_scs}, - setup_requires=["numpy >= 1.7", "setuptools < 60.0"], - install_requires=["numpy >= 1.7", "scipy >= 0.13.2", "setuptools < 60.0"], + setup_requires=["numpy >= 1.7"], + install_requires=["numpy >= 1.7", "scipy >= 0.13.2"], license="MIT", zip_safe=False, # TODO: update this: From 4fe261d8f6398b0a8b81042de52e25e299308a0d Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:47:15 +0100 Subject: [PATCH 5/6] fix py 3.8 --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50dacff..acf165f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,9 @@ jobs: else BLAS_PKGS="blas-devel=*=*openblas" fi - if [[ "$PYTHON_VERSION" == "3.8" ]] || [[ "$PYTHON_VERSION" == "3.9" ]]; then + if [[ "$PYTHON_VERSION" == "3.8" ]]; then + conda install scipy=1.5 numpy=1.19 pytest $BLAS_PKGS pkg-config 'setuptools<=60' + elif [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 pytest $BLAS_PKGS pkg-config elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 pytest $BLAS_PKGS pkg-config From 45007fd7e2905df0b455a06b0034916e3f7e1a93 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Thu, 26 Sep 2024 10:50:19 +0100 Subject: [PATCH 6/6] remove old MANIFEST file --- MANIFEST.in | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index cb98a37..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,17 +0,0 @@ -graft src -graft test -graft scs -graft scs/src -graft scs/test -graft scs/test/problems -graft scs/include -graft scs/linsys -graft scs/linsys/cpu -graft scs/linsys/cpu/direct -graft scs/linsys/cpu/indirect -graft scs/linsys/gpu -graft scs/linsys/gpu/indirect -graft scs/linsys/external -graft scs/linsys/external/amd -graft scs/linsys/external/qdldl -include LICENSE