From 5a8ed170761d6be4ee393d3f447651a24704199d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Thu, 16 Apr 2020 14:26:04 +0200 Subject: [PATCH 1/4] Do not require importlib_metadata on py3.8 --- setup.py | 2 +- signedjson/__init__.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9c09760..c1cc299 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ def read_file(path_segments): "pynacl>=0.3.0", "typing_extensions>=3.5", 'typing>=3.5;python_version<"3.5"', - "importlib_metadata", + 'importlib_metadata;python_version<"3.8"', ], long_description=read_file(("README.rst",)), keywords="json", diff --git a/signedjson/__init__.py b/signedjson/__init__.py index 6641e64..398ca48 100644 --- a/signedjson/__init__.py +++ b/signedjson/__init__.py @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from importlib_metadata import version, PackageNotFoundError +try: + from importlib.metadata import version, PackageNotFoundError +except ImportError: + from importlib_metadata import version, PackageNotFoundError try: __version__ = version(__name__) From b49d1788bb464bcd549467b24f8f2e8f51767f2d Mon Sep 17 00:00:00 2001 From: MeggyCal Date: Sat, 18 Apr 2020 21:17:39 +0200 Subject: [PATCH 2/4] fix coverage --- signedjson/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signedjson/__init__.py b/signedjson/__init__.py index 398ca48..4039e8b 100644 --- a/signedjson/__init__.py +++ b/signedjson/__init__.py @@ -14,7 +14,7 @@ try: from importlib.metadata import version, PackageNotFoundError -except ImportError: +except ImportError: # pragma: no cover from importlib_metadata import version, PackageNotFoundError try: From 03b4c256e184837d3ed251a56bd3e3f1d9e5d4a1 Mon Sep 17 00:00:00 2001 From: MeggyCal Date: Sat, 18 Apr 2020 23:02:56 +0200 Subject: [PATCH 3/4] and now? --- signedjson/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signedjson/__init__.py b/signedjson/__init__.py index 4039e8b..771101b 100644 --- a/signedjson/__init__.py +++ b/signedjson/__init__.py @@ -14,7 +14,7 @@ try: from importlib.metadata import version, PackageNotFoundError -except ImportError: # pragma: no cover +except ImportError: # pragma: nocover from importlib_metadata import version, PackageNotFoundError try: From cb7208bd706d6f61795340c4d73ec931daf0d2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Mon, 20 Apr 2020 15:29:23 +0200 Subject: [PATCH 4/4] two spaces --- signedjson/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signedjson/__init__.py b/signedjson/__init__.py index 771101b..62faa5e 100644 --- a/signedjson/__init__.py +++ b/signedjson/__init__.py @@ -14,7 +14,7 @@ try: from importlib.metadata import version, PackageNotFoundError -except ImportError: # pragma: nocover +except ImportError: # pragma: nocover from importlib_metadata import version, PackageNotFoundError try: