Merge branch 'inveniosoftware:master' into docs-reorg

inveniosoftware · Aug 6, 2024 · b174581 · b174581
2 parents 4448e71 + eb31d24
commit b174581
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-# This file is part of Invenio.
-# Copyright (C) 2020 CERN.
+# Copyright (C) 2020-2024 CERN.
+# Copyright (C) 2020 Northwestern University.
+# Copyright (C) 2022 Graz University of Technology.
 #
-# Invenio is free software; you can redistribute it and/or modify it
+# Datacite is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 name: CI
@@ -15,21 +16,21 @@ on:
     branches: master
   schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron:  '0 3 * * 6'
+    - cron: "0 3 * * 6"
   workflow_dispatch:
     inputs:
       reason:
-        description: 'Reason'
+        description: "Reason"
         required: false
-        default: 'Manual trigger'
+        default: "Manual trigger"
 
 jobs:
   Tests:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-          python-version: [3.8, 3.9]
-          requirements-level: [pypi]
+        python-version: ["3.9", "3.12"]
 
     steps:
       - name: Checkout
@@ -39,24 +40,15 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Generate dependencies
-        run: |
-          pip install wheel requirements-builder
-          requirements-builder -e all --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }}
+          cache: pip
+          cache-dependency-path: setup.cfg
 
       - name: Install dependencies
         run: |
-          pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
           pip install .[all]
           pip freeze
 
       - name: Run tests
-        run: |
-          ./run-tests.sh
+        run: ./run-tests.sh
+
+
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 =