From 8b596ba432c2210f81a0cf70440a448d6f3c0d3e Mon Sep 17 00:00:00 2001 From: PascalEgn Date: Tue, 6 Aug 2024 13:53:03 +0200 Subject: [PATCH] global: add pre-commit with ruff --- .pre-commit-config.yaml | 17 ++++++++++++++++ inspire_dojson/api.py | 7 +++---- inspire_dojson/cds/model.py | 3 ++- inspire_dojson/cds/rules.py | 9 +++------ inspire_dojson/common/rules.py | 7 ++----- inspire_dojson/conferences/model.py | 2 +- inspire_dojson/conferences/rules.py | 5 ++--- inspire_dojson/data/model.py | 3 +-- inspire_dojson/data/rules.py | 2 +- inspire_dojson/experiments/rules.py | 4 +--- inspire_dojson/hep/__init__.py | 2 +- inspire_dojson/hep/model.py | 3 +-- inspire_dojson/hep/rules/bd0xx.py | 5 +---- inspire_dojson/hep/rules/bd1xx.py | 4 +--- inspire_dojson/hep/rules/bd2xx.py | 4 +--- inspire_dojson/hep/rules/bd3xx.py | 2 +- inspire_dojson/hep/rules/bd5xx.py | 4 +--- inspire_dojson/hep/rules/bd6xx.py | 4 +--- inspire_dojson/hep/rules/bd7xx.py | 3 +-- inspire_dojson/hep/rules/bd9xx.py | 3 +-- inspire_dojson/hep/rules/bdFFT.py | 3 +-- inspire_dojson/hepnames/model.py | 3 +-- inspire_dojson/hepnames/rules.py | 10 ++++------ inspire_dojson/institutions/model.py | 2 +- inspire_dojson/institutions/rules.py | 4 +--- inspire_dojson/journals/model.py | 1 - inspire_dojson/journals/rules.py | 3 +-- inspire_dojson/model.py | 1 - inspire_dojson/utils/__init__.py | 10 ++++------ inspire_dojson/utils/geo.py | 2 -- ruff.toml | 30 ++++++++++++++++++++++++++++ setup.py | 7 ++++++- tests/conftest.py | 3 +-- tests/test_api.py | 2 +- tests/test_cds.py | 2 +- tests/test_common.py | 2 +- tests/test_conferences.py | 2 +- tests/test_data.py | 2 +- tests/test_experiments.py | 2 +- tests/test_experiments_model.py | 2 +- tests/test_hep_bd0xx.py | 2 +- tests/test_hep_bd1xx.py | 2 +- tests/test_hep_bd2xx.py | 2 +- tests/test_hep_bd3xx.py | 2 +- tests/test_hep_bd4xx.py | 2 +- tests/test_hep_bd5xx.py | 2 +- tests/test_hep_bd6xx.py | 2 +- tests/test_hep_bd7xx.py | 2 +- tests/test_hep_bd9xx.py | 2 +- tests/test_hep_bdFFT.py | 6 ++---- tests/test_hep_model.py | 2 +- tests/test_hepnames.py | 4 +--- tests/test_institutions.py | 2 +- tests/test_journals.py | 2 +- tests/test_model.py | 2 +- tests/test_utils.py | 7 +++---- tests/test_utils_geo.py | 1 - 57 files changed, 119 insertions(+), 111 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 ruff.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..2c56732d --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,17 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace + - id: fix-byte-order-marker + - id: mixed-line-ending + - id: name-tests-test + args: [ --pytest-test-first ] + exclude: '^(?!factories/)' + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.5.6 + hooks: + - id: ruff + args: [ --fix ] diff --git a/inspire_dojson/api.py b/inspire_dojson/api.py index 522a3a13..628eb1e6 100644 --- a/inspire_dojson/api.py +++ b/inspire_dojson/api.py @@ -28,16 +28,15 @@ import re from itertools import chain +from dojson.contrib.marc21.utils import create_record +from inspire_utils.helpers import force_list +from inspire_utils.record import get_value from lxml.builder import E from lxml.etree import tostring from six import iteritems, text_type, unichr from six.moves import urllib -from dojson.contrib.marc21.utils import create_record - from inspire_dojson.utils import create_record_from_dict, force_single_element -from inspire_utils.helpers import force_list -from inspire_utils.record import get_value from .cds import cds2hep_marc from .conferences import conferences diff --git a/inspire_dojson/cds/model.py b/inspire_dojson/cds/model.py index 4a2ccb19..e7197db1 100644 --- a/inspire_dojson/cds/model.py +++ b/inspire_dojson/cds/model.py @@ -25,8 +25,9 @@ from __future__ import absolute_import, division, print_function from itertools import chain -from inspire_utils.record import get_value + from inspire_utils.helpers import force_list +from inspire_utils.record import get_value from ..model import FilterOverdo, clean_record diff --git a/inspire_dojson/cds/rules.py b/inspire_dojson/cds/rules.py index ad82d511..11cba33a 100644 --- a/inspire_dojson/cds/rules.py +++ b/inspire_dojson/cds/rules.py @@ -31,17 +31,14 @@ import pycountry import rfc3987 import six - -from idutils import is_arxiv from dojson import utils - -from six.moves import urllib - +from idutils import is_arxiv from inspire_utils.helpers import force_list from inspire_utils.name import normalize_name +from six.moves import urllib -from .model import cds2hep_marc from ..utils import force_single_element, quote_url +from .model import cds2hep_marc CATEGORIES = { 'Accelerators and Storage Rings': 'Accelerators', diff --git a/inspire_dojson/common/rules.py b/inspire_dojson/common/rules.py index b2b190bb..3460e925 100644 --- a/inspire_dojson/common/rules.py +++ b/inspire_dojson/common/rules.py @@ -27,15 +27,13 @@ import re from datetime import datetime -from flask import current_app -from six.moves import urllib - from dojson import utils - +from flask import current_app from inspire_schemas.api import load_schema from inspire_schemas.utils import classify_field from inspire_utils.date import PartialDate, earliest_date from inspire_utils.helpers import force_list, maybe_int +from six.moves import urllib from ..conferences.model import conferences from ..data.model import data @@ -50,7 +48,6 @@ get_record_ref, ) - IS_INTERNAL_UID = re.compile(r'^(inspire:uid:)?\d{5}$') IS_ORCID = re.compile(r'^(orcid:)?\d{4}-\d{4}-\d{4}-\d{3}[0-9X]$') diff --git a/inspire_dojson/conferences/model.py b/inspire_dojson/conferences/model.py index 6f6a68fc..abd0e697 100644 --- a/inspire_dojson/conferences/model.py +++ b/inspire_dojson/conferences/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_schema, add_collection, clean_record +from ..model import FilterOverdo, add_collection, add_schema, clean_record def remove_lone_series_number(record, blob): diff --git a/inspire_dojson/conferences/rules.py b/inspire_dojson/conferences/rules.py index c7be443d..72edaa8f 100644 --- a/inspire_dojson/conferences/rules.py +++ b/inspire_dojson/conferences/rules.py @@ -25,12 +25,11 @@ from __future__ import absolute_import, division, print_function from dojson import utils +from inspire_utils.helpers import force_list, maybe_float, maybe_int -from inspire_utils.helpers import force_list, maybe_int, maybe_float - -from .model import conferences from ..utils import force_single_element from ..utils.geo import parse_conference_address +from .model import conferences def _trim_date(date): diff --git a/inspire_dojson/data/model.py b/inspire_dojson/data/model.py index 9c50ee02..9bc94f07 100644 --- a/inspire_dojson/data/model.py +++ b/inspire_dojson/data/model.py @@ -24,8 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_schema, add_collection, clean_record - +from ..model import FilterOverdo, add_collection, add_schema, clean_record filters = [ add_schema('data.json'), diff --git a/inspire_dojson/data/rules.py b/inspire_dojson/data/rules.py index d92bb589..24ec110a 100644 --- a/inspire_dojson/data/rules.py +++ b/inspire_dojson/data/rules.py @@ -27,8 +27,8 @@ from dojson import utils from idutils import normalize_doi -from .model import data from ..utils import force_single_element, get_record_ref +from .model import data @data.over('dois', '^0247.') diff --git a/inspire_dojson/experiments/rules.py b/inspire_dojson/experiments/rules.py index 3f6938d4..439ef315 100644 --- a/inspire_dojson/experiments/rules.py +++ b/inspire_dojson/experiments/rules.py @@ -26,13 +26,11 @@ from dojson import utils from dojson.errors import IgnoreKey - from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from .model import experiments from ..utils import force_single_element, get_record_ref - +from .model import experiments EXPERIMENT_CATEGORIES_MAP = \ {'1': 'Collider Experiments', diff --git a/inspire_dojson/hep/__init__.py b/inspire_dojson/hep/__init__.py index 0f103c6f..95f0535e 100644 --- a/inspire_dojson/hep/__init__.py +++ b/inspire_dojson/hep/__init__.py @@ -24,6 +24,7 @@ from __future__ import absolute_import, division, print_function +from .model import hep, hep2marc # noqa: F401 from .rules import ( # noqa: F401 bd0xx, bd1xx, @@ -36,4 +37,3 @@ bd9xx, bdFFT, ) -from .model import hep, hep2marc # noqa: F401 diff --git a/inspire_dojson/hep/model.py b/inspire_dojson/hep/model.py index 42771c2c..5e18c86f 100644 --- a/inspire_dojson/hep/model.py +++ b/inspire_dojson/hep/model.py @@ -27,12 +27,11 @@ import itertools import six - +from inspire_schemas.builders.literature import is_citeable from inspire_schemas.utils import ( convert_old_publication_info_to_new, normalize_arxiv_category, ) -from inspire_schemas.builders.literature import is_citeable from inspire_utils.helpers import force_list from inspire_utils.record import get_value diff --git a/inspire_dojson/hep/rules/bd0xx.py b/inspire_dojson/hep/rules/bd0xx.py index 66724136..42c8c6b6 100644 --- a/inspire_dojson/hep/rules/bd0xx.py +++ b/inspire_dojson/hep/rules/bd0xx.py @@ -28,17 +28,14 @@ from collections import defaultdict import pycountry - from dojson import utils from idutils import is_arxiv_post_2007, is_doi, is_handle, normalize_doi - from inspire_schemas.api import load_schema from inspire_schemas.utils import normalize_arxiv_category from inspire_utils.helpers import force_list -from ..model import hep, hep2marc from ...utils import force_single_element, normalize_isbn - +from ..model import hep, hep2marc RE_LANGUAGE = re.compile(r'\/| or | and |,|=|\s+') diff --git a/inspire_dojson/hep/rules/bd1xx.py b/inspire_dojson/hep/rules/bd1xx.py index 9c98e21c..c53dca54 100644 --- a/inspire_dojson/hep/rules/bd1xx.py +++ b/inspire_dojson/hep/rules/bd1xx.py @@ -27,16 +27,14 @@ import re from dojson import utils - from inspire_utils.dedupers import dedupe_list from inspire_utils.helpers import force_list, maybe_int -from ..model import hep, hep2marc from ...utils import ( force_single_element, get_record_ref, ) - +from ..model import hep, hep2marc ORCID = re.compile(r'\d{4}-\d{4}-\d{4}-\d{3}[0-9Xx]') diff --git a/inspire_dojson/hep/rules/bd2xx.py b/inspire_dojson/hep/rules/bd2xx.py index e2df2513..59d54273 100644 --- a/inspire_dojson/hep/rules/bd2xx.py +++ b/inspire_dojson/hep/rules/bd2xx.py @@ -25,13 +25,11 @@ from __future__ import absolute_import, division, print_function import langdetect - from dojson import utils - from inspire_utils.helpers import force_list -from ..model import hep, hep2marc from ...utils import normalize_date_aggressively +from ..model import hep, hep2marc @hep.over('titles', '^(210|245|246|247)..') diff --git a/inspire_dojson/hep/rules/bd3xx.py b/inspire_dojson/hep/rules/bd3xx.py index 9913e12b..9520a437 100644 --- a/inspire_dojson/hep/rules/bd3xx.py +++ b/inspire_dojson/hep/rules/bd3xx.py @@ -26,8 +26,8 @@ from inspire_utils.helpers import maybe_int -from ..model import hep, hep2marc from ...utils import force_single_element +from ..model import hep, hep2marc @hep.over('number_of_pages', '^300..') diff --git a/inspire_dojson/hep/rules/bd5xx.py b/inspire_dojson/hep/rules/bd5xx.py index a52cf25b..a381d1ee 100644 --- a/inspire_dojson/hep/rules/bd5xx.py +++ b/inspire_dojson/hep/rules/bd5xx.py @@ -27,13 +27,11 @@ import re from dojson import utils - from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from ..model import hep, hep2marc from ...utils import force_single_element, get_record_ref - +from ..model import hep, hep2marc IS_DEFENSE_DATE = re.compile('Presented (on )?(?P.*)', re.IGNORECASE) diff --git a/inspire_dojson/hep/rules/bd6xx.py b/inspire_dojson/hep/rules/bd6xx.py index f58aebbc..0bf4edc9 100644 --- a/inspire_dojson/hep/rules/bd6xx.py +++ b/inspire_dojson/hep/rules/bd6xx.py @@ -25,13 +25,11 @@ from __future__ import absolute_import, division, print_function import six - from dojson import utils - from inspire_utils.helpers import force_list -from ..model import hep, hep2marc from ...utils import force_single_element, get_record_ref +from ..model import hep, hep2marc ENERGY_RANGES_MAP = { '1': '0-3 GeV', diff --git a/inspire_dojson/hep/rules/bd7xx.py b/inspire_dojson/hep/rules/bd7xx.py index 5a85c24b..a95a4fda 100644 --- a/inspire_dojson/hep/rules/bd7xx.py +++ b/inspire_dojson/hep/rules/bd7xx.py @@ -25,7 +25,6 @@ from __future__ import absolute_import, division, print_function from dojson import utils - from inspire_schemas.api import load_schema from inspire_schemas.utils import ( convert_new_publication_info_to_old, @@ -34,13 +33,13 @@ ) from inspire_utils.helpers import force_list, maybe_int -from ..model import hep, hep2marc from ...utils import ( force_single_element, get_recid_from_ref, get_record_ref, normalize_isbn, ) +from ..model import hep, hep2marc @hep.over('collaborations', '^710..') diff --git a/inspire_dojson/hep/rules/bd9xx.py b/inspire_dojson/hep/rules/bd9xx.py index 8ef04f31..0180a9a6 100644 --- a/inspire_dojson/hep/rules/bd9xx.py +++ b/inspire_dojson/hep/rules/bd9xx.py @@ -28,7 +28,6 @@ from dojson import utils from idutils import is_arxiv_post_2007 - from inspire_schemas.api import ReferenceBuilder, load_schema from inspire_schemas.utils import ( build_pubnote, @@ -38,8 +37,8 @@ from inspire_utils.helpers import force_list, maybe_int from inspire_utils.record import get_value -from ..model import hep, hep2marc from ...utils import force_single_element, get_recid_from_ref, get_record_ref +from ..model import hep, hep2marc COLLECTIONS_MAP = { 'babar-analysisdocument': 'BABAR Analysis Documents', diff --git a/inspire_dojson/hep/rules/bdFFT.py b/inspire_dojson/hep/rules/bdFFT.py index bded0913..606be63e 100644 --- a/inspire_dojson/hep/rules/bdFFT.py +++ b/inspire_dojson/hep/rules/bdFFT.py @@ -28,11 +28,10 @@ import re from dojson import utils - from inspire_utils.helpers import force_list -from ..model import hep, hep2marc from ...utils import absolute_url, afs_url, afs_url_to_path +from ..model import hep, hep2marc @hep.over('documents', '^FFT[^%][^%]') diff --git a/inspire_dojson/hepnames/model.py b/inspire_dojson/hepnames/model.py index 07de915c..873301ef 100644 --- a/inspire_dojson/hepnames/model.py +++ b/inspire_dojson/hepnames/model.py @@ -24,8 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_schema, add_collection, clean_marc, clean_record - +from ..model import FilterOverdo, add_collection, add_schema, clean_marc, clean_record hepnames_filters = [ add_schema('authors.json'), diff --git a/inspire_dojson/hepnames/rules.py b/inspire_dojson/hepnames/rules.py index 2ac13b8a..b4b4cdac 100644 --- a/inspire_dojson/hepnames/rules.py +++ b/inspire_dojson/hepnames/rules.py @@ -27,7 +27,6 @@ import re from dojson import utils - from inspire_schemas.api import load_schema from inspire_schemas.utils import ( normalize_arxiv_category, @@ -37,16 +36,15 @@ from inspire_utils.helpers import force_list, maybe_int from inspire_utils.name import normalize_name -from .model import hepnames, hepnames2marc from ..utils import ( force_single_element, - get_record_ref, get_recid_from_ref, + get_record_ref, normalize_rank, quote_url, - unquote_url + unquote_url, ) - +from .model import hepnames, hepnames2marc AWARD_YEAR = re.compile(r'\(?(?P\d{4})\)?') INSPIRE_BAI = re.compile(r'(\w+\.)+\d+') @@ -760,7 +758,7 @@ def _is_deleted(value): return force_single_element(value.get('c', '')).upper() == 'DELETED' def _is_stub(value): - return not (force_single_element(value.get('a', '')).upper() == 'USEFUL') + return force_single_element(value.get('a', '')).upper() != 'USEFUL' deleted = self.get('deleted') stub = self.get('stub') diff --git a/inspire_dojson/institutions/model.py b/inspire_dojson/institutions/model.py index 287e5bfe..18320f75 100644 --- a/inspire_dojson/institutions/model.py +++ b/inspire_dojson/institutions/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_schema, add_collection, clean_record +from ..model import FilterOverdo, add_collection, add_schema, clean_record def combine_addresses_and_location(record, blob): diff --git a/inspire_dojson/institutions/rules.py b/inspire_dojson/institutions/rules.py index f9d618d0..c4d14e68 100644 --- a/inspire_dojson/institutions/rules.py +++ b/inspire_dojson/institutions/rules.py @@ -27,13 +27,11 @@ import re from dojson import utils - from inspire_utils.helpers import force_list, maybe_float, maybe_int -from .model import institutions from ..utils import force_single_element, get_record_ref from ..utils.geo import parse_institution_address - +from .model import institutions ACRONYM = re.compile(r'\s*\((.*)\)\s*$') diff --git a/inspire_dojson/journals/model.py b/inspire_dojson/journals/model.py index 4b8ef804..aee36e66 100644 --- a/inspire_dojson/journals/model.py +++ b/inspire_dojson/journals/model.py @@ -26,7 +26,6 @@ from ..model import FilterOverdo, add_collection, add_schema, clean_record - filters = [ add_schema('journals.json'), add_collection('Journals'), diff --git a/inspire_dojson/journals/rules.py b/inspire_dojson/journals/rules.py index a9470c8c..c2c87303 100644 --- a/inspire_dojson/journals/rules.py +++ b/inspire_dojson/journals/rules.py @@ -26,12 +26,11 @@ from dojson import utils from idutils import normalize_issn - from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from .model import journals from ..utils import get_record_ref +from .model import journals @journals.over('issns', '^022..') diff --git a/inspire_dojson/model.py b/inspire_dojson/model.py index b19d01d0..6e2cccf7 100644 --- a/inspire_dojson/model.py +++ b/inspire_dojson/model.py @@ -32,7 +32,6 @@ from dojson import Overdo from dojson.errors import IgnoreKey - from six import raise_from from .errors import DoJsonError diff --git a/inspire_dojson/utils/__init__.py b/inspire_dojson/utils/__init__.py index de4138b4..9127b4ab 100644 --- a/inspire_dojson/utils/__init__.py +++ b/inspire_dojson/utils/__init__.py @@ -27,16 +27,14 @@ import os import re -from flask import current_app -from isbn import ISBN -from six import binary_type, iteritems, text_type -from six.moves import urllib - from dojson.utils import GroupableOrderedDict - +from flask import current_app from inspire_utils.date import normalize_date from inspire_utils.dedupers import dedupe_list, dedupe_list_of_dicts from inspire_utils.helpers import force_list, maybe_int +from isbn import ISBN +from six import binary_type, iteritems, text_type +from six.moves import urllib DEFAULT_AFS_PATH = '/afs/cern.ch/project/inspire/PROD' diff --git a/inspire_dojson/utils/geo.py b/inspire_dojson/utils/geo.py index 71739b46..7f095dbc 100644 --- a/inspire_dojson/utils/geo.py +++ b/inspire_dojson/utils/geo.py @@ -25,10 +25,8 @@ from __future__ import absolute_import, division, print_function import six - from inspire_utils.helpers import force_list - country_to_iso_code = { 'AFGHANISTAN': 'AF', 'ÅLAND ISLANDS': 'AX', diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 00000000..0ddeba11 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,30 @@ +target-version = "py311" +line-length = 100 +[lint.flake8-tidy-imports] +ban-relative-imports = "all" + +[lint] +select = [ + # pycodestyle + "E", + # Pyflakes + "F", + # flake8-bugbear + "B", + # flake8-simplify + "SIM", + # isort + "I", + # flake8-tidy-imports + "TID", + # flake8-pytest-style + "PT", +] +ignore = ["B904", "B905", "E501"] + + +[lint.pycodestyle] +ignore-overlong-task-comments = true + +[lint.pydocstyle] +convention = "google" diff --git a/setup.py b/setup.py index 2cd0e60b..aca2dac1 100644 --- a/setup.py +++ b/setup.py @@ -54,13 +54,18 @@ "pytest-cov~=2.0,>=2.6.1", ] +dev_require = [ + "pre-commit==3.5.0", +] + extras_require = { "docs": docs_require, "tests": tests_require, + "dev": dev_require, } extras_require["all"] = [] -for name, reqs in extras_require.items(): +for _name, reqs in extras_require.items(): extras_require["all"].extend(reqs) packages = find_packages(exclude=["docs"]) diff --git a/tests/conftest.py b/tests/conftest.py index 2521c61d..22c12d47 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -22,9 +22,8 @@ from __future__ import absolute_import, division, print_function import pytest -from langdetect import DetectorFactory from flask import Flask - +from langdetect import DetectorFactory CONFIG = { 'SERVER_NAME': 'localhost:5000', diff --git a/tests/test_api.py b/tests/test_api.py index d0d786a0..0a16b937 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -24,7 +24,7 @@ import pytest -from inspire_dojson.api import marcxml2record, record2marcxml, cds_marcxml2record +from inspire_dojson.api import cds_marcxml2record, marcxml2record, record2marcxml from inspire_dojson.errors import NotSupportedError diff --git a/tests/test_cds.py b/tests/test_cds.py index 1bfe07b8..eacd8759 100644 --- a/tests/test_cds.py +++ b/tests/test_cds.py @@ -23,11 +23,11 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.cds import cds2hep_marc from inspire_dojson.hep import hep from inspire_dojson.utils import create_record_from_dict -from inspire_schemas.api import load_schema, validate def test_external_system_identifiers_from_001(): diff --git a/tests/test_common.py b/tests/test_common.py index dd44a888..fe31d826 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -23,11 +23,11 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.conferences import conferences from inspire_dojson.hep import hep, hep2marc from inspire_dojson.hepnames import hepnames, hepnames2marc -from inspire_schemas.api import load_schema, validate def test_acquisition_source_from_541__a_c(): diff --git a/tests/test_conferences.py b/tests/test_conferences.py index e1e040c8..0c38247a 100644 --- a/tests/test_conferences.py +++ b/tests/test_conferences.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.conferences import conferences -from inspire_schemas.api import load_schema, validate def test_addresses_from_034__d_f_and_111__c(): diff --git a/tests/test_data.py b/tests/test_data.py index 057ff10d..1d156c7a 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.data import data -from inspire_schemas.api import load_schema, validate def test_dois_from_0247_2_a(): diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 91c04aeb..f819f951 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.experiments import experiments -from inspire_schemas.api import load_schema, validate def test_dates_from_046__q_s_and_046__r(): diff --git a/tests/test_experiments_model.py b/tests/test_experiments_model.py index 08251b67..488655a8 100644 --- a/tests/test_experiments_model.py +++ b/tests/test_experiments_model.py @@ -22,8 +22,8 @@ from __future__ import absolute_import, division, print_function -from inspire_dojson.model import FilterOverdo from inspire_dojson.experiments.model import add_project_type +from inspire_dojson.model import FilterOverdo def test_add_project_type(): diff --git a/tests/test_hep_bd0xx.py b/tests/test_hep_bd0xx.py index 618258ac..d639c145 100644 --- a/tests/test_hep_bd0xx.py +++ b/tests/test_hep_bd0xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_isbns_from_020__a(): diff --git a/tests/test_hep_bd1xx.py b/tests/test_hep_bd1xx.py index b011d445..59908ffa 100644 --- a/tests/test_hep_bd1xx.py +++ b/tests/test_hep_bd1xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_authors_from_100__a_i_u_x_y(): diff --git a/tests/test_hep_bd2xx.py b/tests/test_hep_bd2xx.py index 9e59ca04..c5bbd571 100644 --- a/tests/test_hep_bd2xx.py +++ b/tests/test_hep_bd2xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_rpp_from_210__a(): diff --git a/tests/test_hep_bd3xx.py b/tests/test_hep_bd3xx.py index ba726240..d8166bba 100644 --- a/tests/test_hep_bd3xx.py +++ b/tests/test_hep_bd3xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_number_of_pages_from_300__a(): diff --git a/tests/test_hep_bd4xx.py b/tests/test_hep_bd4xx.py index 99b7c48f..18794ae2 100644 --- a/tests/test_hep_bd4xx.py +++ b/tests/test_hep_bd4xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_book_series_from_490__a(): diff --git a/tests/test_hep_bd5xx.py b/tests/test_hep_bd5xx.py index 7f650628..b7cf13c2 100644 --- a/tests/test_hep_bd5xx.py +++ b/tests/test_hep_bd5xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_public_notes_from_500__a_9(): diff --git a/tests/test_hep_bd6xx.py b/tests/test_hep_bd6xx.py index f1f49ea5..2feb690c 100644 --- a/tests/test_hep_bd6xx.py +++ b/tests/test_hep_bd6xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_keywords_from_084__a_2(): diff --git a/tests/test_hep_bd7xx.py b/tests/test_hep_bd7xx.py index 8b320598..ad86169b 100644 --- a/tests/test_hep_bd7xx.py +++ b/tests/test_hep_bd7xx.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate def test_collaborations_from_710__g(): diff --git a/tests/test_hep_bd9xx.py b/tests/test_hep_bd9xx.py index 6e652574..746d5398 100644 --- a/tests/test_hep_bd9xx.py +++ b/tests/test_hep_bd9xx.py @@ -23,6 +23,7 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep, hep2marc from inspire_dojson.hep.rules.bd9xx import ( @@ -31,7 +32,6 @@ DOCUMENT_TYPE_MAP, DOCUMENT_TYPE_REVERSE_MAP, ) -from inspire_schemas.api import load_schema, validate def test_collections_map_contains_all_valid_collections(): diff --git a/tests/test_hep_bdFFT.py b/tests/test_hep_bdFFT.py index 40c6bb12..9684f476 100644 --- a/tests/test_hep_bdFFT.py +++ b/tests/test_hep_bdFFT.py @@ -23,17 +23,15 @@ from __future__ import absolute_import, division, print_function import pytest - from dojson.contrib.marc21.utils import create_record - from flask import current_app +from inspire_schemas.api import load_schema, validate from mock import patch from inspire_dojson.hep import hep, hep2marc -from inspire_schemas.api import load_schema, validate -@pytest.fixture +@pytest.fixture() def legacy_afs_service_config(): config = { 'LABS_AFS_HTTP_SERVICE': 'http://legacy-afs-web' diff --git a/tests/test_hep_model.py b/tests/test_hep_model.py index 00cdeb54..df0e81cf 100644 --- a/tests/test_hep_model.py +++ b/tests/test_hep_model.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.hep import hep -from inspire_schemas.api import load_schema, validate def test_ensure_curated(): diff --git a/tests/test_hepnames.py b/tests/test_hepnames.py index 3bc68b47..f40844cf 100644 --- a/tests/test_hepnames.py +++ b/tests/test_hepnames.py @@ -23,12 +23,10 @@ from __future__ import absolute_import, division, print_function import pytest - from dojson.contrib.marc21.utils import create_record - -from inspire_dojson.hepnames import hepnames2marc, hepnames from inspire_schemas.api import load_schema, validate +from inspire_dojson.hepnames import hepnames, hepnames2marc EXPERIMENTS_DATA = [ [ diff --git a/tests/test_institutions.py b/tests/test_institutions.py index 7ed3a511..7dac11bf 100644 --- a/tests/test_institutions.py +++ b/tests/test_institutions.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.institutions import institutions -from inspire_schemas.api import load_schema, validate def test_addresses_from_034__d_f_and_371__double_a_b_d_g(): diff --git a/tests/test_journals.py b/tests/test_journals.py index f19eb6f3..a4ca246b 100644 --- a/tests/test_journals.py +++ b/tests/test_journals.py @@ -23,9 +23,9 @@ from __future__ import absolute_import, division, print_function from dojson.contrib.marc21.utils import create_record +from inspire_schemas.api import load_schema, validate from inspire_dojson.journals import journals -from inspire_schemas.api import load_schema, validate def test_issns_from_022__a(): diff --git a/tests/test_model.py b/tests/test_model.py index f3533b51..929346ba 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -24,8 +24,8 @@ import pytest -from inspire_dojson.model import FilterOverdo, add_schema from inspire_dojson import DoJsonError, marcxml2record, record2marcxml +from inspire_dojson.model import FilterOverdo, add_schema def test_filteroverdo_works_without_filters(): diff --git a/tests/test_utils.py b/tests/test_utils.py index ff91cba3..4fd5d6aa 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -23,7 +23,6 @@ from __future__ import absolute_import, division, print_function import pytest - from flask import current_app from mock import patch @@ -31,13 +30,13 @@ absolute_url, afs_url, afs_url_to_path, - normalize_rank, + dedupe_all_lists, force_single_element, get_recid_from_ref, get_record_ref, - dedupe_all_lists, - strip_empty_values, normalize_date_aggressively, + normalize_rank, + strip_empty_values, ) diff --git a/tests/test_utils_geo.py b/tests/test_utils_geo.py index e51dd413..24d497d1 100644 --- a/tests/test_utils_geo.py +++ b/tests/test_utils_geo.py @@ -28,7 +28,6 @@ parse_institution_address, ) - # TODO: test match_country_code