Skip to content

Commit 9220b77

Browse files
authored
Merge pull request #31418 from rcomer/pin-setuptools-scm-backport
Backport PR #31401: BLD: Temporarily pin setuptools-scm<10
2 parents cc7fe5a + 6aac3da commit 9220b77

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/cygwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
export PATH="/usr/local/bin:$PATH"
182182
python -m pip install --no-build-isolation 'contourpy>=1.0.1'
183183
python -m pip install --upgrade cycler fonttools \
184-
packaging pyparsing python-dateutil setuptools-scm \
184+
packaging pyparsing python-dateutil 'setuptools-scm<10' \
185185
-r requirements_test.txt sphinx ipython
186186
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
187187
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ jobs:
243243
# Preinstall build requirements to enable no-build-isolation builds.
244244
python -m pip install --upgrade $PRE \
245245
'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \
246-
packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
246+
packaging pillow 'pyparsing!=3.1.0' python-dateutil 'setuptools-scm<10' \
247247
'meson-python>=0.13.1' 'pybind11>=2.13.2' \
248248
-r requirements/testing/all.txt \
249249
${{ matrix.extra-requirements }}

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- pyqt
2727
- python>=3.10
2828
- python-dateutil>=2.1
29-
- setuptools_scm
29+
- setuptools_scm<10
3030
- wxpython
3131
# building documentation
3232
- colorspacious

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ requires-python = ">=3.10"
5050
dev = [
5151
"meson-python>=0.13.1,<0.17.0",
5252
"pybind11>=2.13.2,!=2.13.3",
53-
"setuptools_scm>=7",
53+
"setuptools_scm>=7,<10",
5454
# Not required by us but setuptools_scm without a version, cso _if_
5555
# installed, then setuptools_scm 8 requires at least this version.
5656
# Unfortunately, we can't do a sort of minimum-if-instaled dependency, so
@@ -74,7 +74,7 @@ build-backend = "mesonpy"
7474
requires = [
7575
"meson-python>=0.13.1,<0.17.0",
7676
"pybind11>=2.13.2,!=2.13.3",
77-
"setuptools_scm>=7",
77+
"setuptools_scm>=7,<10",
7878
]
7979

8080
[tool.meson-python.args]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pybind11>=2.13.2,!=2.13.3
22
meson-python
3-
setuptools-scm
3+
setuptools-scm<10

requirements/testing/mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ packaging>=20.0
2222
pillow>=8
2323
pyparsing>=3
2424
python-dateutil>=2.7
25-
setuptools_scm>=7
25+
setuptools_scm>=7,<10
2626
setuptools>=64

0 commit comments

Comments
 (0)