From 4b68e0c4ee45b1a4c985bbd8d6ebc1a138e2cc82 Mon Sep 17 00:00:00 2001 From: PD Hall Date: Wed, 17 May 2023 20:59:57 +0100 Subject: [PATCH] fix: restore support for python>=3.7,<3.9 --- jupyterlab_code_formatter/formatters.py | 6 +++++- jupyterlab_code_formatter/tests/test_handlers.py | 6 +++++- pyproject.toml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/jupyterlab_code_formatter/formatters.py b/jupyterlab_code_formatter/formatters.py index 887e72d..74246ef 100644 --- a/jupyterlab_code_formatter/formatters.py +++ b/jupyterlab_code_formatter/formatters.py @@ -14,7 +14,11 @@ import rpy2.robjects except ImportError: pass -from functools import cache +if sys.version_info >= (3, 9): + from functools import cache +else: + from functools import lru_cache + cache = lru_cache(maxsize=None) from packaging import version diff --git a/jupyterlab_code_formatter/tests/test_handlers.py b/jupyterlab_code_formatter/tests/test_handlers.py index ae5dcbc..b7e8077 100644 --- a/jupyterlab_code_formatter/tests/test_handlers.py +++ b/jupyterlab_code_formatter/tests/test_handlers.py @@ -1,6 +1,10 @@ import json +import sys import typing as t -from importlib.metadata import version +if sys.version_info >= (3, 8): + from importlib.metadata import version +else: + from importlib_metadata import version import pytest from jsonschema import validate diff --git a/pyproject.toml b/pyproject.toml index 2c79f41..8cc66d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,6 +51,7 @@ test = [ "blue==0.9.1", "isort", "yapf", + "importlib_metadata; python_version<'3.8'", ] [tool.hatch.envs.default]