From 97b0990f3aa16195f3d76c98014f19fe9f1e215e Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 8 Jul 2024 09:41:50 +0200 Subject: [PATCH] package: replace pkg_resources with importlib --- datacite/schema31.py | 5 +++-- datacite/schema40.py | 5 +++-- datacite/schema41.py | 5 +++-- datacite/schema42.py | 5 +++-- datacite/schema43.py | 5 +++-- setup.cfg | 1 + 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/datacite/schema31.py b/datacite/schema31.py index cc5a054..acc0354 100644 --- a/datacite/schema31.py +++ b/datacite/schema31.py @@ -10,7 +10,8 @@ """DataCite v3.1 JSON to XML transformations.""" -import pkg_resources +import importlib.resources as importlib_resources + from lxml import etree from lxml.builder import E @@ -37,7 +38,7 @@ } validator = validator_factory( - pkg_resources.resource_filename("datacite", "schemas/datacite-v3.1.json") + importlib_resources.files("datacite") / "schemas/datacite-v3.1.json" ) diff --git a/datacite/schema40.py b/datacite/schema40.py index e19927b..baae170 100644 --- a/datacite/schema40.py +++ b/datacite/schema40.py @@ -10,7 +10,8 @@ """DataCite v4.0 JSON to XML transformations.""" -import pkg_resources +import importlib.resources as importlib_resources + from lxml import etree from lxml.builder import E @@ -37,7 +38,7 @@ } validator = validator_factory( - pkg_resources.resource_filename("datacite", "schemas/datacite-v4.0.json") + importlib_resources.files("datacite") / "schemas/datacite-v4.0.json" ) diff --git a/datacite/schema41.py b/datacite/schema41.py index 66fd165..6f26b59 100644 --- a/datacite/schema41.py +++ b/datacite/schema41.py @@ -10,7 +10,8 @@ """DataCite v4.1 JSON to XML transformations.""" -import pkg_resources +import importlib.resources as importlib_resources + from lxml import etree from lxml.builder import E @@ -37,7 +38,7 @@ } validator = validator_factory( - pkg_resources.resource_filename("datacite", "schemas/datacite-v4.1.json") + importlib_resources.files("datacite") / "schemas/datacite-v4.1.json" ) diff --git a/datacite/schema42.py b/datacite/schema42.py index bb57476..9a245ed 100644 --- a/datacite/schema42.py +++ b/datacite/schema42.py @@ -11,7 +11,8 @@ """DataCite v4.2 JSON to XML transformations.""" -import pkg_resources +import importlib.resources as importlib_resources + from lxml import etree from lxml.builder import E @@ -38,7 +39,7 @@ } validator = validator_factory( - pkg_resources.resource_filename("datacite", "schemas/datacite-v4.2.json") + importlib_resources.files("datacite") / "schemas/datacite-v4.2.json" ) diff --git a/datacite/schema43.py b/datacite/schema43.py index 5bef9f0..19511f8 100644 --- a/datacite/schema43.py +++ b/datacite/schema43.py @@ -11,7 +11,8 @@ """DataCite v4.3 JSON to XML transformations.""" -import pkg_resources +import importlib.resources as importlib_resources + from lxml import etree from lxml.builder import E @@ -38,7 +39,7 @@ } validator = validator_factory( - pkg_resources.resource_filename("datacite", "schemas/datacite-v4.3.json") + importlib_resources.files("datacite") / "schemas/datacite-v4.3.json" ) diff --git a/setup.cfg b/setup.cfg index eabb17b..3fbbebb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,6 +34,7 @@ install_requires = lxml>=4.5.2 requests>=2.12.2 idutils>=1.0.0 + importlib-metadata>=6.11.0 [options.extras_require] tests =