global: remove python2 support

invenio_oaiserver/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -182,8 +182,6 @@
 (GPLv3 licensed).
 """
 
-from __future__ import absolute_import, print_function
-
 from .ext import InvenioOAIServer
 from .proxies import current_oaiserver
 from .version import __version__

invenio_oaiserver/errors.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 # Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Error."""
 
-from __future__ import absolute_import, print_function
-
 
 class OAIBadMetadataFormatError(Exception):
     """Metadata format required doesn't exist."""

invenio_oaiserver/ext.py

@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 # Copyright (C) 2021-2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Invenio-OAIServer extension implementation."""
 
-from __future__ import absolute_import, print_function
-
 from invenio_base.utils import obj_or_import_string
-from invenio_records import signals as records_signals
 from sqlalchemy.event import contains, listen, remove
 
 from . import config

invenio_oaiserver/fetchers.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 # Copyright (C) 2021 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Persistent identifier fetchers."""
 
-from __future__ import absolute_import, print_function
-
 from elasticsearch_dsl.query import Q
 from invenio_pidstore.errors import PersistentIdentifierError
 from invenio_pidstore.fetchers import FetchedPID

invenio_oaiserver/minters.py

@@ -1,22 +1,17 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Persistent identifier minters."""
 
-from __future__ import absolute_import, print_function
-
-from datetime import datetime
-
 from flask import current_app
 from invenio_pidstore import current_pidstore
 
 from .provider import OAIIDProvider
-from .utils import datetime_to_datestamp
 
 
 def oaiid_minter(record_uuid, data):

invenio_oaiserver/models.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 # Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
@@ -11,12 +11,10 @@
 
 from flask_babelex import lazy_gettext as _
 from invenio_db import db
-from sqlalchemy.event import listen
 from sqlalchemy.orm import validates
 from sqlalchemy_utils import Timestamp
 
 from .errors import OAISetSpecUpdateError
-from .proxies import current_oaiserver
 
 
 class OAISet(db.Model, Timestamp):

invenio_oaiserver/percolator.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2017-2018 CERN.
+# Copyright (C) 2017-2022 CERN.
 # Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Percolator."""
 
-from __future__ import absolute_import, print_function
-
 import json
 
 from elasticsearch import VERSION as ES_VERSION
@@ -23,8 +21,6 @@
 
 from invenio_oaiserver.query import query_string_parser
 
-from .proxies import current_oaiserver
-
 
 def _build_percolator_index_name(index):
     """Build percolator index name."""

invenio_oaiserver/provider.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """OAI-PMH ID provider."""
 
-from __future__ import absolute_import, print_function
-
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.base import BaseProvider
 

invenio_oaiserver/proxies.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Helper proxy to the state object."""
 
-from __future__ import absolute_import, print_function
-
 from flask import current_app
 from werkzeug.local import LocalProxy
 

invenio_oaiserver/query.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 # Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Query parser."""
 
-import six
 from elasticsearch import VERSION as ES_VERSION
 from elasticsearch_dsl import Q
 from flask import current_app
@@ -25,7 +24,7 @@ def query_string_parser(search_pattern):
     """Elasticsearch query string parser."""
     if not hasattr(current_oaiserver, 'query_parser'):
         query_parser = current_app.config['OAISERVER_QUERY_PARSER']
-        if isinstance(query_parser, six.string_types):
+        if isinstance(query_parser, str):
             query_parser = import_string(query_parser)
         current_oaiserver.query_parser = query_parser
     query_parser_fields = (

invenio_oaiserver/receivers.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2016-2018 CERN.
+# Copyright (C) 2016-2022 CERN.
 # Copyright (C) 2022 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Record field function."""
 
-from __future__ import absolute_import, print_function
-
 from .percolator import _delete_percolator, _new_percolator
 
 

invenio_oaiserver/utils.py

@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Utilities."""
 
-from __future__ import absolute_import, print_function
-
 import re
 from datetime import datetime
-from functools import partial
+from functools import lru_cache, partial
 
 from flask import current_app
 from invenio_base.utils import obj_or_import_string
@@ -22,12 +20,6 @@
 
 from .proxies import current_oaiserver
 
-try:
-    from functools import lru_cache
-except ImportError:  # pragma: no cover
-    from functools32 import lru_cache
-
-
 ns = {
     None: 'http://datacite.org/schema/kernel-4',
     'xsi': 'http://www.w3.org/2001/XMLSchema-instance',

invenio_oaiserver/verbs.py

@@ -10,11 +10,9 @@
 
 """OAI-PMH verbs."""
 
-from __future__ import absolute_import
-
 from flask import current_app, request
 from invenio_rest.serializer import BaseSchema
-from marshmallow import ValidationError, fields, utils, validates_schema
+from marshmallow import ValidationError, fields, validates_schema
 from marshmallow.fields import DateTime as _DateTime
 from marshmallow.utils import isoformat
 

invenio_oaiserver/version.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2020 CERN.
+# Copyright (C) 2015-2022 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -12,6 +12,4 @@
 and parsed by ``setup.py``.
 """
 
-from __future__ import absolute_import, print_function
-
 __version__ = '1.3.0'

invenio_oaiserver/views/server.py

@@ -9,8 +9,6 @@
 
 """OAI-PMH 2.0 server."""
 
-from __future__ import absolute_import
-
 from flask import Blueprint, make_response
 from invenio_pidstore.errors import PIDDoesNotExistError
 from itsdangerous import BadSignature

setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2019 CERN.
+# Copyright (C) 2015-2022 CERN.
 # Copyright (C)      2021 Graz University of Technology.
 # Copyright (C)      2021 TU Wien.
 #
@@ -148,10 +148,10 @@
         'Programming Language :: Python',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Development Status :: 5 - Production/Stable',
     ],
 )

tests/conftest.py

@@ -8,8 +8,6 @@
 
 """Pytest configuration."""
 
-from __future__ import absolute_import, print_function
-
 import os
 import shutil
 import tempfile

tests/helpers.py

@@ -9,8 +9,6 @@
 
 """Utilities for loading test records."""
 
-from __future__ import absolute_import, print_function
-
 import uuid
 
 import mock
@@ -21,7 +19,6 @@
 from invenio_indexer.api import RecordIndexer
 from invenio_pidstore.minters import recid_minter
 from invenio_pidstore.models import PersistentIdentifier
-from invenio_records import Record
 from invenio_records.models import RecordMetadata
 from invenio_search import current_search, current_search_client
 

tests/test_admin.py

@@ -8,8 +8,6 @@
 
 """Test admin interface."""
 
-from __future__ import absolute_import, print_function
-
 from flask import url_for
 from flask_admin import Admin, menu
 from invenio_db import db

tests/test_app.py

@@ -8,8 +8,6 @@
 
 """Test app."""
 
-from __future__ import absolute_import
-
 import pytest
 from flask import Flask
 

tests/test_invenio_oaiserver.py

@@ -8,8 +8,6 @@
 
 """Module tests."""
 
-from __future__ import absolute_import, print_function
-
 import socket
 
 import pytest

tests/test_verbs.py

@@ -10,8 +10,6 @@
 
 """Test OAI verbs."""
 
-from __future__ import absolute_import
-
 import uuid
 from copy import deepcopy
 from datetime import datetime, timedelta