Merge branch 'master' into issue-810

biocore · Jul 10, 2023 · 6cdf3f9 · 6cdf3f9
2 parents 6a87850 + 6163b4e
commit 6cdf3f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -16,6 +16,7 @@ Emperor ChangeLog
 
 * Pin Sphinx version to be less than 4.0.
 * Jupyter templates no longer require jQuery to add the CSS headers.
+* Limit jinja2 version for doc dependencies in setup.py. Allowed versions are: `>=2.9` and `<3.1`.
 * Fix broken test suite with Pandas >=1.5 ([#810](https://github.com/biocore/emperor/issues/810)).
 
 # Emperor 1.0.3 (14 Apr 2021)

diff --git a/setup.py b/setup.py
@@ -36,7 +36,8 @@
 
 base = ["numpy >= 1.7", "scipy >= 0.17.0", "click", "pandas",
  "scikit-bio >= 0.4.1", "jinja2 >= 2.9", "future"]
-doc = ["Sphinx<4", "sphinx-bootstrap-theme", "numpydoc"]
+doc = ["Sphinx<4", "jinja2 >= 2.9, < 3.1", "sphinx-bootstrap-theme",
+ "numpydoc"]
 test = ["pep8", "flake8", "nose"]
 all_deps = base + doc + test