Skip to content

Commit

Permalink
Merge pull request #823 from effigies/mnt/avoid_jinja2v3
Browse files Browse the repository at this point in the history
MNT: Avoid jinja2 v3 until nbconvert handles breakages
  • Loading branch information
effigies committed Mar 25, 2022
2 parents 7af6c9e + ede7f96 commit 4b19b36
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
@@ -1,2 +1,2 @@
[build-system]
requires = ["setuptools >= 30.3.0", "wheel"]
requires = ["setuptools >= 30.3.0, != 61.0.0", "wheel"]
2 changes: 2 additions & 0 deletions setup.cfg
Expand Up @@ -60,6 +60,8 @@ ci_tests =
pytest-xdist
tutorial =
nbconvert
jinja2 <3 # Required until nbconvert handles all deprecations/removals
markupsafe <2.1 # Required until we can upgrade jinja2
jupyter_client
ipykernel
dev =
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -6,7 +6,7 @@
# Give setuptools a hint to complain if it's too old a version
# 30.3.0 allows us to put most metadata in setup.cfg
# Should match pyproject.toml
SETUP_REQUIRES = ['setuptools >= 30.3.0']
SETUP_REQUIRES = ['setuptools >= 30.3.0, != 61.0.0']
# This enables setuptools to install wheel on-the-fly
SETUP_REQUIRES += ['wheel'] if 'bdist_wheel' in sys.argv else []

Expand Down
2 changes: 1 addition & 1 deletion tools/ci/env.sh
@@ -1,4 +1,4 @@
SETUP_REQUIRES="pip setuptools>=30.3.0 wheel"
SETUP_REQUIRES="pip setuptools>=30.3.0,!=61.0.0 wheel"

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

0 comments on commit 4b19b36

Please sign in to comment.