Skip to content

Commit dad55fd

Browse files
committed
Temporarily address SC-16218 by pinning setuptools
setuptools 61 was recently released with changes to default behavior for operations related to package_data and package_dir. Pending full resolution, pin older setuptools to fix CI.
1 parent f4fb64f commit dad55fd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

misc/requirements_wheel.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ numpy==1.17.* ; python_version == "3.8" and platform_machine !='aarch64'
44
numpy==1.19.4 ; python_version == "3.9" and platform_machine !='aarch64'
55

66
# NOTE: oldest-supported-numpy (1.19.2) had forward ABI compat problems
7-
numpy==1.20.* ; python_version < "3.10" and platform_machine=='aarch64'
7+
numpy==1.20.* ; python_version < "3.10" and platform_machine=='aarch64'
88
numpy==1.21.* ; python_version >= "3.10"
99

1010
#-------------------------------
1111
# Note 11/23/2021: the current version of the AWS sdk does not work with cmake 3.22
1212
cmake >= 3.21, < 3.22
1313
cython >= 0.27
1414
pybind11 >= 2.6.2
15-
setuptools >= 18.0
15+
setuptools >= 18.0, < 61.0
1616
setuptools_scm >= 1.5.4
1717
wheel >= 0.30
1818
contextvars ;python_version<"3.7"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=42", "wheel", "pybind11>=2.6.2"]
2+
requires = ["setuptools>=42,<61.0", "wheel", "pybind11>=2.6.2"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.pytest.ini_options]

requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ numpy >= 1.16.5
77
cmake >= 3.21, < 3.22
88
cython >= 0.27
99
pybind11 >= 2.6.2
10-
setuptools >= 18.0
10+
setuptools >= 18.0, < 61.0
1111
setuptools_scm >= 1.5.4
1212
wheel >= 0.30
1313
contextvars ;python_version<"3.7"

0 commit comments

Comments
 (0)