Merge branch 'mainline' into ankerl-mmap

amzn · Aug 28, 2024 · a54ac74 · a54ac74
2 parents 720fdf1 + 455db26
commit a54ac74
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -49,8 +49,10 @@ mypy:
 
 
 # Install and unit test
+# TODO: remove pin on pip and setuptools after removing numpy.distutils
 libpecos:
-	python3 -m pip install --upgrade pip
+	python3 -m pip install pip==23.0.1
+	python3 -m pip install "setuptools<=73.0.1"
 	${WARN_AS_ERROR_CMD} python3 -m pip install ${VFLAG} --editable .
 
 .PHONY: test

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,10 @@
 [aliases]
 test=pytest
 
+# TODO: remove pin on setuptools version after removing numpy.distutils
+[build-system]
+requires = ["setuptools<=73.0.1"]
+
 # Configuration for pytest; enable coverage for pecos, emit
 # XML, HTML, and terminal reports.
 [tool:pytest]

diff --git a/setup.py b/setup.py
@@ -106,6 +106,7 @@ def get_blas_lib_dir(cls):
 
 # Requirements
 numpy_requires = [
+    'setuptools<=73.0.1', # TODO: remove pin on setuptools version after removing numpy.distutils
     'numpy>=1.19.5,<2.0.0; python_version>="3.8"'
 ]
 setup_requires = numpy_requires + [