Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixup: PR 811: install an upper-bounded version of Jinja2 during documentation build #812

Merged
merged 7 commits into from
Jan 26, 2023
Merged

Fixup: PR 811: install an upper-bounded version of Jinja2 during documentation build #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b803cd
BUG: Fixes issue with Pandas >=1.5
ElDeveloper Jan 13, 2023
22f0688
ENH: Use newer version of node
ElDeveloper Jan 13, 2023
de26d4d
(Re)install a semver-upper-bounded version of jinja2 package dependen…
jayaddison Jan 23, 2023
c3824bc
Revert "(Re)install a semver-upper-bounded version of jinja2 package …
jayaddison Jan 24, 2023
ae84d8e
Specify semver-upper-bounded version of jinja2 package-documentation …
jayaddison Jan 24, 2023
7ec9cb1
Fixup: flake8-acceptable formatting for setup.py
jayaddison Jan 26, 2023
a930cfb
Update ChangeLog.md
ElDeveloper Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Node.js enviroment
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16

- uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
4 changes: 3 additions & 1 deletion ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Emperor ChangeLog
### Bug Fixes

* Update remote URL to no longer use rawgit.
([#751(https://github.com/biocore/emperor/issues/751)]).
([#751](https://github.com/biocore/emperor/issues/751)).

### New Features

Expand All @@ -16,6 +16,8 @@ Emperor ChangeLog

* Pin Sphinx version to be less than 4.0.
* Jupyter templates no longer require jQuery to add the CSS headers.
* Fix broken test suite with Pandas >=1.5 ([#810](https://github.com/biocore/emperor/issues/810)).
* Limit jinja2 version for doc dependencies in setup.py. Allowed versions are: `>=2.9` and `<3.1`.

# Emperor 1.0.3 (14 Apr 2021)
-----------------------------
Expand Down
4 changes: 2 additions & 2 deletions emperor/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@ def _validate_metadata(self, metadata, matrix, ignore_missing_samples,
'are using metadata and coordinates corresponding'
' to the same dataset.' % kind)

# sort the elements so we have a deterministic output
difference = sorted([str(i) for i in difference])
if difference and not ignore_missing_samples:
# sort the elements so we have a deterministic output
difference = sorted([str(i) for i in difference])

# if there's more than 5 missing elements, truncate the list
if len(difference) > 5:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down