Skip to content

Commit

Permalink
remove jinja / nbconvert pin (#7819)
Browse files Browse the repository at this point in the history
* remove jinja pin

* remove nbconvert pin

* dagstermill tests

* remove template reference

* papermill remove steps

* ge_example

* add pin for great expectations

* unpin

* pin example

* add back tests for papermill 1
  • Loading branch information
prha committed May 10, 2022
1 parent ccb2fd1 commit e6c5bb0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion examples/ge_example/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dagster",
"dagit",
"dagster-ge",
"great_expectations",
"great_expectations>=0.14.12", # pinned because pip is using the cached wheel for 0.13.14
],
author="Elementl",
license="Apache-2.0",
Expand Down
1 change: 0 additions & 1 deletion python_modules/dagit/dagit/webserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ async def download_notebook(self, request: Request):
# parse content to HTML
notebook = nbformat.reads(notebook_content, as_version=4)
html_exporter = HTMLExporter()
html_exporter.template_file = "basic"
(body, resources) = html_exporter.from_notebook_node(notebook)
return HTMLResponse("<style>" + resources["inlining"]["css"][0] + "</style>" + body)

Expand Down
5 changes: 1 addition & 4 deletions python_modules/dagit/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,11 @@ def get_version():
"click>=7.0,<9.0",
f"dagster{pin}",
f"dagster-graphql{pin}",
# 5.2+ stops pulling in `ipython_genutils`, on which the old version of `nbconvert` we use
# implicitly depends. Can remove nbformat dependency entirely when/if cap on nbconvert is lifted.
"nbformat<=5.1.3",
"requests",
# watchdog
"watchdog>=0.8.3",
# notebooks support
"nbconvert>=5.4.0,<6.0.0",
"nbconvert",
"starlette",
"uvicorn[standard]",
],
Expand Down
3 changes: 1 addition & 2 deletions python_modules/dagster/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ def get_version() -> str:
"click>=5.0",
"coloredlogs>=6.1, <=14.0",
"contextvars; python_version < '3.7'",
# https://github.com/dagster-io/dagster/issues/4167
"Jinja2<3.0",
"Jinja2",
"markupsafe<=2.0.1",
"PyYAML>=5.1",
# core (not explicitly expressed atm)
Expand Down
3 changes: 1 addition & 2 deletions python_modules/libraries/dagster-dbt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ def get_version() -> str:
],
extras_require={
"test": [
# https://github.com/dagster-io/dagster/issues/4167
"Jinja2<3.0",
"Jinja2",
"dbt-core",
"dbt-rpc",
"dbt-postgres",
Expand Down
2 changes: 2 additions & 0 deletions python_modules/libraries/dagstermill/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ deps =
papermill1: papermill<2.0.0
papermill1: jupyter-client<6.1.13
papermill1: nbconvert<6.0.0
papermill1: nbformat<=5.1.3
papermill1: Jinja2<3.0
-e ../../dagster[test]
-e ../dagster-pandas
allowlist_externals =
Expand Down

0 comments on commit e6c5bb0

Please sign in to comment.