Skip to content

Commit

Permalink
The dependency on markdown-it-py is conditional on python>=3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mwouts committed Jan 3, 2021
1 parent 91223d2 commit 4ac643e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2020 Marc Wouts
Copyright (c) 2018-2021 Marc Wouts

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 8 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
Jupytext ChangeLog
==================

1.8.1 (2021-01-03)
------------------

**Changed**
- The dependency on `markdown-it-py` is conditional on `python>=3.6` ([#697](https://github.com/mwouts/jupytext/issues/697))


1.8.0 (2020-12-22)
------------------

**Changed**
- Removed support for Python 2.7 and 3.5, a preliminary step towards a JupyterLab 3.0-compatible extension ([#683](https://github.com/mwouts/jupytext/issues/683))
- The MyST Markdown format uses markdown-it-py~=0.6.0 ([#692](https://github.com/mwouts/jupytext/issues/692))
- The MyST Markdown format uses `markdown-it-py~=0.6.0` ([#692](https://github.com/mwouts/jupytext/issues/692))


1.7.1 (2020-11-16)
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- jupyterlab
- pyyaml
- toml
- markdown-it-py~=0.6.0
- nbconvert
- ipykernel
- jupyter_contrib_nbextensions
Expand All @@ -32,4 +33,3 @@ dependencies:
- tox-conda
- pip:
- sphinx_copybutton
- myst_parser
2 changes: 1 addition & 1 deletion jupytext/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Jupytext's version number"""

__version__ = "1.8.0"
__version__ = "1.8.1"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
markdown-it-py~=0.6.0
#markdown-it-py~=0.6.0
nbformat>=4.0.0
pyyaml
toml
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@
],
entry_points={"console_scripts": ["jupytext = jupytext.cli:jupytext"]},
tests_require=["pytest"],
install_requires=["markdown-it-py~=0.6.0", "nbformat>=4.0.0", "pyyaml", "toml"],
install_requires=[
"markdown-it-py~=0.6.0; python_version >= '3.6'",
"nbformat>=4.0.0",
"pyyaml",
"toml",
],
extras_require={
# left for back-compatibility
"myst": [],
Expand Down

0 comments on commit 4ac643e

Please sign in to comment.