From ef9f3192560323c6ef626ea9d8e9822a4a6d485d Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Mon, 10 May 2021 12:00:48 +0200 Subject: [PATCH] Remove Packaging Dependency --- jupyter_server/_version.py | 11 +++++++++-- pyproject.toml | 2 +- setup.cfg | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/jupyter_server/_version.py b/jupyter_server/_version.py index d260b1806..eba2dab0c 100644 --- a/jupyter_server/_version.py +++ b/jupyter_server/_version.py @@ -2,8 +2,15 @@ store the current version info of the server. """ -from jupyter_packaging import get_version_info +import re # Version string must appear intact for tbump versioning __version__ = '1.7.0.dev0' -version_info = get_version_info(__version__) + +# Build up version_info tuple for backwards compatibility +pattern = r'(?P\d+).(?P\d+).(?P\d+)(?P.*)' +match = re.match(pattern, __version__) +parts = [int(match[part]) for part in ['major', 'minor', 'patch']] +if match['rest']: + parts.append(match['rest']) +version_info = tuple(parts) diff --git a/pyproject.toml b/pyproject.toml index aad18428b..8f9ac44b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["jupyter_packaging~=0.9"] +requires = ["jupyter_packaging~=0.9,<2"] build-backend = "jupyter_packaging.build_api" [tool.jupyter-packaging.builder] diff --git a/setup.cfg b/setup.cfg index cae52729b..cca74a481 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,6 @@ install_requires = traitlets>=4.2.1 jupyter_core>=4.6.0 jupyter_client>=6.1.1 - jupyter_packaging~=0.9 nbformat nbconvert Send2Trash