Skip to content

Commit 4b19b36

Browse files
authored
Merge pull request #823 from effigies/mnt/avoid_jinja2v3
MNT: Avoid jinja2 v3 until nbconvert handles breakages
2 parents 7af6c9e + ede7f96 commit 4b19b36

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[build-system]
2-
requires = ["setuptools >= 30.3.0", "wheel"]
2+
requires = ["setuptools >= 30.3.0, != 61.0.0", "wheel"]

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ ci_tests =
6060
pytest-xdist
6161
tutorial =
6262
nbconvert
63+
jinja2 <3 # Required until nbconvert handles all deprecations/removals
64+
markupsafe <2.1 # Required until we can upgrade jinja2
6365
jupyter_client
6466
ipykernel
6567
dev =

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Give setuptools a hint to complain if it's too old a version
77
# 30.3.0 allows us to put most metadata in setup.cfg
88
# Should match pyproject.toml
9-
SETUP_REQUIRES = ['setuptools >= 30.3.0']
9+
SETUP_REQUIRES = ['setuptools >= 30.3.0, != 61.0.0']
1010
# This enables setuptools to install wheel on-the-fly
1111
SETUP_REQUIRES += ['wheel'] if 'bdist_wheel' in sys.argv else []
1212

tools/ci/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SETUP_REQUIRES="pip setuptools>=30.3.0 wheel"
1+
SETUP_REQUIRES="pip setuptools>=30.3.0,!=61.0.0 wheel"
22

33
# Numpy and scipy upload nightly/weekly/intermittent wheels
44
NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple"

0 commit comments

Comments
 (0)