From 7c8c586ab4fb0c70180c4a5063d64fb29d904860 Mon Sep 17 00:00:00 2001 From: Theodore Aptekarev Date: Mon, 21 Nov 2022 22:56:02 +0100 Subject: [PATCH 1/2] Pin setuptools to the latest version used on the CI --- pyproject.toml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7597d42e00..ed0bbd1bbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,6 @@ requires = [ "numpy>=1.21,<1.22; python_version=='3.10' and (platform_machine!='arm64' or platform_system!='Darwin')", "numpy>=1.21.4,<1.22; python_version=='3.10' and (platform_machine=='arm64' and platform_system=='Darwin')", "scipy >= 1.1.0", - "setuptools>=40.8.0", + "setuptools>=40.8.0,<=64.0.2", "wheel" ] diff --git a/setup.py b/setup.py index 1936b6c31e..b8a7f591a3 100644 --- a/setup.py +++ b/setup.py @@ -231,6 +231,7 @@ def not_on_windows(s: str) -> str: "scs >= 1.1.6", "numpy >= 1.15", "scipy >= 1.1.0", + "setuptools <= 64.0.2", ], setup_requires=["numpy >= 1.15"], ) From c0df27130083e4d952ee0ffc8dd54b19e139a490 Mon Sep 17 00:00:00 2001 From: Theodore Aptekarev Date: Tue, 22 Nov 2022 13:23:38 +0100 Subject: [PATCH 2/2] Pin setuptools version for the SCS build --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 7418fcb825..ee1c13090c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ PDLP = ortools>=9.3,<9.5 PROXQP = proxsuite SCIP = PySCIPOpt SCIPY = scipy -SCS = +SCS = setuptools<64.0.2 XPRESS = xpress [flake8]