diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4741dc7b..c1a31ce9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -28,6 +28,8 @@ Changed compiling them directly. - Change the CommandModule class' optional unload method to invoke top-level unload functions like the Natlink loader does. +- Use ``lark`` on Python 3.8+ and keep ``lark-parser`` for older Python + versions. - Make the logging output of Dragonfly's CLI commands more sane. - Make some optimizations to the Natlink engine. - Rename the engines.backend_sphinx.misc module to config. diff --git a/documentation/requirements.txt b/documentation/requirements.txt index 10ec74dc..9ced131c 100644 --- a/documentation/requirements.txt +++ b/documentation/requirements.txt @@ -4,4 +4,4 @@ six enum34;python_version<'3.4' sphinx-argparse sphinx_rtd_theme -lark-parser +lark diff --git a/setup.py b/setup.py index 62110649..ad4e8d80 100644 --- a/setup.py +++ b/setup.py @@ -128,7 +128,10 @@ def _try_local_natlink_pyd(self): "setuptools >= 40.0.0", "packaging >= 19.0", "six", - "lark-parser >= 0.8.0", + # Use the renamed package on modern Python versions, + # while keeping compatibility with older versions. + "lark>=1.0.0;python_version>='3.8'", + "lark-parser>=0.8.0;python_version<'3.8'", # Windows-only dependencies. "pywin32;platform_system=='Windows'",