diff --git a/inspire_dojson/__init__.py b/inspire_dojson/__init__.py index c69c7cc..d6f976e 100644 --- a/inspire_dojson/__init__.py +++ b/inspire_dojson/__init__.py @@ -24,8 +24,8 @@ from __future__ import absolute_import, division, print_function -from . import common # noqa: F401 -from .api import marcxml2record, record2marcxml # noqa: F401 -from .errors import DoJsonError # noqa: F401 +from inspire_dojson import common # noqa: F401 +from inspire_dojson.api import marcxml2record, record2marcxml # noqa: F401 +from inspire_dojson.errors import DoJsonError # noqa: F401 __version__ = "63.2.22" diff --git a/inspire_dojson/api.py b/inspire_dojson/api.py index 628eb1e..ef642d4 100644 --- a/inspire_dojson/api.py +++ b/inspire_dojson/api.py @@ -36,18 +36,17 @@ from six import iteritems, text_type, unichr from six.moves import urllib +from inspire_dojson.cds import cds2hep_marc +from inspire_dojson.conferences import conferences +from inspire_dojson.data import data +from inspire_dojson.errors import NotSupportedError +from inspire_dojson.experiments import experiments +from inspire_dojson.hep import hep, hep2marc +from inspire_dojson.hepnames import hepnames, hepnames2marc +from inspire_dojson.institutions import institutions +from inspire_dojson.journals import journals from inspire_dojson.utils import create_record_from_dict, force_single_element -from .cds import cds2hep_marc -from .conferences import conferences -from .data import data -from .errors import NotSupportedError -from .experiments import experiments -from .hep import hep, hep2marc -from .hepnames import hepnames, hepnames2marc -from .institutions import institutions -from .journals import journals - try: unichr(0x100000) RE_INVALID_CHARS_FOR_XML = re.compile( diff --git a/inspire_dojson/cds/__init__.py b/inspire_dojson/cds/__init__.py index 892b9c1..04958dc 100644 --- a/inspire_dojson/cds/__init__.py +++ b/inspire_dojson/cds/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import cds2hep_marc # noqa: F401 +from inspire_dojson.cds import rules # noqa: F401 +from inspire_dojson.cds.model import cds2hep_marc # noqa: F401 diff --git a/inspire_dojson/cds/model.py b/inspire_dojson/cds/model.py index e7197db..1fc4708 100644 --- a/inspire_dojson/cds/model.py +++ b/inspire_dojson/cds/model.py @@ -29,7 +29,7 @@ from inspire_utils.helpers import force_list from inspire_utils.record import get_value -from ..model import FilterOverdo, clean_record +from inspire_dojson.model import FilterOverdo, clean_record def add_control_number(record, blob): diff --git a/inspire_dojson/cds/rules.py b/inspire_dojson/cds/rules.py index 11cba33..aa5a94a 100644 --- a/inspire_dojson/cds/rules.py +++ b/inspire_dojson/cds/rules.py @@ -24,6 +24,7 @@ from __future__ import absolute_import, division, print_function +import contextlib import os import re from itertools import chain @@ -37,8 +38,8 @@ from inspire_utils.name import normalize_name from six.moves import urllib -from ..utils import force_single_element, quote_url -from .model import cds2hep_marc +from inspire_dojson.cds.model import cds2hep_marc +from inspire_dojson.utils import force_single_element, quote_url CATEGORIES = { 'Accelerators and Storage Rings': 'Accelerators', @@ -52,7 +53,6 @@ 'Engineering': 'Instrumentation', 'General Relativity and Cosmology': 'Gravitation and Cosmology', 'General Theoretical Physics': 'General Physics', - 'General Theoretical Physics': 'General Physics', 'Information Transfer and Management': 'Other', 'Mathematical Physics and Mathematics': 'Math and Math Physics', 'Nuclear Physics - Experiment': 'Experiment-Nucl', @@ -195,10 +195,8 @@ def languages(self, key, value): try: languages.append({'a': pycountry.languages.get(alpha_3=alpha_3).name}) except KeyError: - try: + with contextlib.suppress(KeyError): languages.append({'a': pycountry.languages.get(bibliographic=alpha_3).name}) - except KeyError: - pass return languages diff --git a/inspire_dojson/common/__init__.py b/inspire_dojson/common/__init__.py index 7e89ca5..d715f5a 100644 --- a/inspire_dojson/common/__init__.py +++ b/inspire_dojson/common/__init__.py @@ -24,4 +24,4 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 +from inspire_dojson.common import rules # noqa: F401 diff --git a/inspire_dojson/common/rules.py b/inspire_dojson/common/rules.py index 3460e92..22d67ac 100644 --- a/inspire_dojson/common/rules.py +++ b/inspire_dojson/common/rules.py @@ -35,18 +35,14 @@ from inspire_utils.helpers import force_list, maybe_int from six.moves import urllib -from ..conferences.model import conferences -from ..data.model import data -from ..experiments.model import experiments -from ..hep.model import hep, hep2marc -from ..hepnames.model import hepnames, hepnames2marc -from ..institutions.model import institutions -from ..journals.model import journals -from ..utils import ( - force_single_element, - get_recid_from_ref, - get_record_ref, -) +from inspire_dojson.conferences.model import conferences +from inspire_dojson.data.model import data +from inspire_dojson.experiments.model import experiments +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.hepnames.model import hepnames, hepnames2marc +from inspire_dojson.institutions.model import institutions +from inspire_dojson.journals.model import journals +from inspire_dojson.utils import force_single_element, get_recid_from_ref, 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]$') @@ -643,15 +639,9 @@ def _get_datetime(value): a_values = force_list(value.get('a')) for a_value in a_values: if IS_INTERNAL_UID.match(a_value): - if a_value.startswith('inspire:uid:'): - internal_uid = int(a_value[12:]) - else: - internal_uid = int(a_value) + internal_uid = int(a_value[12:]) if a_value.startswith('inspire:uid:') else int(a_value) elif IS_ORCID.match(a_value): - if a_value.startswith('orcid:'): - orcid = a_value[6:] - else: - orcid = a_value + orcid = a_value[6:] if a_value.startswith('orcid:') else a_value else: source = a_value diff --git a/inspire_dojson/conferences/__init__.py b/inspire_dojson/conferences/__init__.py index 4eb2222..f85e269 100644 --- a/inspire_dojson/conferences/__init__.py +++ b/inspire_dojson/conferences/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import conferences # noqa: F401 +from inspire_dojson.conferences import rules # noqa: F401 +from inspire_dojson.conferences.model import conferences # noqa: F401 diff --git a/inspire_dojson/conferences/model.py b/inspire_dojson/conferences/model.py index abd0e69..dc82ff1 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_collection, add_schema, clean_record +from inspire_dojson.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 80c774f..3899079 100644 --- a/inspire_dojson/conferences/rules.py +++ b/inspire_dojson/conferences/rules.py @@ -27,9 +27,9 @@ from dojson import utils from inspire_utils.helpers import force_list, maybe_float, maybe_int -from ..utils import force_single_element -from ..utils.geo import parse_conference_address -from .model import conferences +from inspire_dojson.conferences.model import conferences +from inspire_dojson.utils import force_single_element +from inspire_dojson.utils.geo import parse_conference_address def _trim_date(date): diff --git a/inspire_dojson/data/__init__.py b/inspire_dojson/data/__init__.py index dccbe47..be3a99f 100644 --- a/inspire_dojson/data/__init__.py +++ b/inspire_dojson/data/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import data # noqa: F401 +from inspire_dojson.data import rules # noqa: F401 +from inspire_dojson.data.model import data # noqa: F401 diff --git a/inspire_dojson/data/model.py b/inspire_dojson/data/model.py index 9bc94f0..29b46f8 100644 --- a/inspire_dojson/data/model.py +++ b/inspire_dojson/data/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_collection, add_schema, clean_record +from inspire_dojson.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 24ec110..3f067dd 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 ..utils import force_single_element, get_record_ref -from .model import data +from inspire_dojson.data.model import data +from inspire_dojson.utils import force_single_element, get_record_ref @data.over('dois', '^0247.') diff --git a/inspire_dojson/experiments/__init__.py b/inspire_dojson/experiments/__init__.py index a03f4b1..04b98eb 100644 --- a/inspire_dojson/experiments/__init__.py +++ b/inspire_dojson/experiments/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import experiments # noqa: F401 +from inspire_dojson.experiments import rules # noqa: F401 +from inspire_dojson.experiments.model import experiments # noqa: F401 diff --git a/inspire_dojson/experiments/model.py b/inspire_dojson/experiments/model.py index d976860..16668fa 100644 --- a/inspire_dojson/experiments/model.py +++ b/inspire_dojson/experiments/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_collection, add_schema, clean_record +from inspire_dojson.model import FilterOverdo, add_collection, add_schema, clean_record def add_project_type(record, blob): diff --git a/inspire_dojson/experiments/rules.py b/inspire_dojson/experiments/rules.py index 439ef31..bcaaf56 100644 --- a/inspire_dojson/experiments/rules.py +++ b/inspire_dojson/experiments/rules.py @@ -29,8 +29,8 @@ from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from ..utils import force_single_element, get_record_ref -from .model import experiments +from inspire_dojson.experiments.model import experiments +from inspire_dojson.utils import force_single_element, get_record_ref EXPERIMENT_CATEGORIES_MAP = \ {'1': 'Collider Experiments', diff --git a/inspire_dojson/hep/__init__.py b/inspire_dojson/hep/__init__.py index 95f0535..5adebfd 100644 --- a/inspire_dojson/hep/__init__.py +++ b/inspire_dojson/hep/__init__.py @@ -24,16 +24,4 @@ from __future__ import absolute_import, division, print_function -from .model import hep, hep2marc # noqa: F401 -from .rules import ( # noqa: F401 - bd0xx, - bd1xx, - bd2xx, - bd3xx, - bd4xx, - bd5xx, - bd6xx, - bd7xx, - bd9xx, - bdFFT, -) +from inspire_dojson.hep.model import hep, hep2marc # noqa: F401 diff --git a/inspire_dojson/hep/model.py b/inspire_dojson/hep/model.py index 5e18c86..411e006 100644 --- a/inspire_dojson/hep/model.py +++ b/inspire_dojson/hep/model.py @@ -35,7 +35,7 @@ from inspire_utils.helpers import force_list from inspire_utils.record import get_value -from ..model import FilterOverdo, add_schema, clean_marc, clean_record +from inspire_dojson.model import FilterOverdo, add_schema, clean_marc, clean_record def add_arxiv_categories(record, blob): diff --git a/inspire_dojson/hep/rules/bd0xx.py b/inspire_dojson/hep/rules/bd0xx.py index 42c8c6b..5b6067e 100644 --- a/inspire_dojson/hep/rules/bd0xx.py +++ b/inspire_dojson/hep/rules/bd0xx.py @@ -34,8 +34,8 @@ from inspire_schemas.utils import normalize_arxiv_category from inspire_utils.helpers import force_list -from ...utils import force_single_element, normalize_isbn -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element, normalize_isbn 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 e0323db..8c9e979 100644 --- a/inspire_dojson/hep/rules/bd1xx.py +++ b/inspire_dojson/hep/rules/bd1xx.py @@ -30,11 +30,8 @@ from inspire_utils.dedupers import dedupe_list from inspire_utils.helpers import force_list, maybe_int -from ...utils import ( - force_single_element, - get_record_ref, -) -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element, get_record_ref 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 59d5427..003492a 100644 --- a/inspire_dojson/hep/rules/bd2xx.py +++ b/inspire_dojson/hep/rules/bd2xx.py @@ -28,8 +28,8 @@ from dojson import utils from inspire_utils.helpers import force_list -from ...utils import normalize_date_aggressively -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import normalize_date_aggressively @hep.over('titles', '^(210|245|246|247)..') diff --git a/inspire_dojson/hep/rules/bd3xx.py b/inspire_dojson/hep/rules/bd3xx.py index 9520a43..d3b00e9 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 ...utils import force_single_element -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element @hep.over('number_of_pages', '^300..') diff --git a/inspire_dojson/hep/rules/bd4xx.py b/inspire_dojson/hep/rules/bd4xx.py index d2999ab..c05479c 100644 --- a/inspire_dojson/hep/rules/bd4xx.py +++ b/inspire_dojson/hep/rules/bd4xx.py @@ -26,7 +26,7 @@ from dojson import utils -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc @hep.over('book_series', '^490..') diff --git a/inspire_dojson/hep/rules/bd5xx.py b/inspire_dojson/hep/rules/bd5xx.py index 8f92cca..7dfde76 100644 --- a/inspire_dojson/hep/rules/bd5xx.py +++ b/inspire_dojson/hep/rules/bd5xx.py @@ -30,8 +30,8 @@ from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from ...utils import force_single_element, get_record_ref -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element, get_record_ref 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 69253ef..b2e8898 100644 --- a/inspire_dojson/hep/rules/bd6xx.py +++ b/inspire_dojson/hep/rules/bd6xx.py @@ -28,8 +28,8 @@ from dojson import utils from inspire_utils.helpers import force_list -from ...utils import force_single_element, get_record_ref -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element, get_record_ref ENERGY_RANGES_MAP = { '1': '0-3 GeV', diff --git a/inspire_dojson/hep/rules/bd7xx.py b/inspire_dojson/hep/rules/bd7xx.py index a95a4fd..81cffb0 100644 --- a/inspire_dojson/hep/rules/bd7xx.py +++ b/inspire_dojson/hep/rules/bd7xx.py @@ -33,13 +33,13 @@ ) from inspire_utils.helpers import force_list, maybe_int -from ...utils import ( +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.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 0180a9a..0a0e2f6 100644 --- a/inspire_dojson/hep/rules/bd9xx.py +++ b/inspire_dojson/hep/rules/bd9xx.py @@ -37,8 +37,8 @@ from inspire_utils.helpers import force_list, maybe_int from inspire_utils.record import get_value -from ...utils import force_single_element, get_recid_from_ref, get_record_ref -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import force_single_element, get_recid_from_ref, get_record_ref COLLECTIONS_MAP = { 'babar-analysisdocument': 'BABAR Analysis Documents', diff --git a/inspire_dojson/hep/rules/bdFFT.py b/inspire_dojson/hep/rules/bdFFT.py index 606be63..b721ce4 100644 --- a/inspire_dojson/hep/rules/bdFFT.py +++ b/inspire_dojson/hep/rules/bdFFT.py @@ -30,8 +30,8 @@ from dojson import utils from inspire_utils.helpers import force_list -from ...utils import absolute_url, afs_url, afs_url_to_path -from ..model import hep, hep2marc +from inspire_dojson.hep.model import hep, hep2marc +from inspire_dojson.utils import absolute_url, afs_url, afs_url_to_path @hep.over('documents', '^FFT[^%][^%]') diff --git a/inspire_dojson/hepnames/__init__.py b/inspire_dojson/hepnames/__init__.py index af6754d..5292f16 100644 --- a/inspire_dojson/hepnames/__init__.py +++ b/inspire_dojson/hepnames/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import hepnames, hepnames2marc # noqa: F401 +from inspire_dojson.hepnames import rules # noqa: F401 +from inspire_dojson.hepnames.model import hepnames, hepnames2marc # noqa: F401 diff --git a/inspire_dojson/hepnames/model.py b/inspire_dojson/hepnames/model.py index 873301e..b47532d 100644 --- a/inspire_dojson/hepnames/model.py +++ b/inspire_dojson/hepnames/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_collection, add_schema, clean_marc, clean_record +from inspire_dojson.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 89bfe0f..96673b6 100644 --- a/inspire_dojson/hepnames/rules.py +++ b/inspire_dojson/hepnames/rules.py @@ -36,7 +36,8 @@ from inspire_utils.helpers import force_list, maybe_int from inspire_utils.name import normalize_name -from ..utils import ( +from inspire_dojson.hepnames.model import hepnames, hepnames2marc +from inspire_dojson.utils import ( force_single_element, get_recid_from_ref, get_record_ref, @@ -44,7 +45,6 @@ quote_url, unquote_url, ) -from .model import hepnames, hepnames2marc AWARD_YEAR = re.compile(r'\(?(?P\d{4})\)?') INSPIRE_BAI = re.compile(r'(\w+\.)+\d+') @@ -533,10 +533,7 @@ def birth_and_death_date2marc(self, key, value): def awards(self, key, value): award = AWARD_YEAR.sub('', value.get('a')).strip() year_match = AWARD_YEAR.search(value.get('a')) - if year_match: - year = int(year_match.group('year')) - else: - year = None + year = int(year_match.group('year')) if year_match else None return { 'name': award, @@ -570,8 +567,7 @@ def _get_json_experiments(marc_dict): yield { 'curated_relation': record is not None, 'current': ( - True if marc_dict.get('z', '').lower() == 'current' - else False + marc_dict.get('z', '').lower() == 'current' ), 'end_date': end_year, 'name': name, diff --git a/inspire_dojson/institutions/__init__.py b/inspire_dojson/institutions/__init__.py index 783e9d4..70024b7 100644 --- a/inspire_dojson/institutions/__init__.py +++ b/inspire_dojson/institutions/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import institutions # noqa: F401 +from inspire_dojson.institutions import rules # noqa: F401 +from inspire_dojson.institutions.model import institutions # noqa: F401 diff --git a/inspire_dojson/institutions/model.py b/inspire_dojson/institutions/model.py index 18320f7..c4b0980 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_collection, add_schema, clean_record +from inspire_dojson.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 c493f53..fe0e7ca 100644 --- a/inspire_dojson/institutions/rules.py +++ b/inspire_dojson/institutions/rules.py @@ -29,9 +29,9 @@ from dojson import utils from inspire_utils.helpers import force_list, maybe_float, maybe_int -from ..utils import force_single_element, get_record_ref -from ..utils.geo import parse_institution_address -from .model import institutions +from inspire_dojson.institutions.model import institutions +from inspire_dojson.utils import force_single_element, get_record_ref +from inspire_dojson.utils.geo import parse_institution_address ACRONYM = re.compile(r'\s*\((.*)\)\s*$') diff --git a/inspire_dojson/journals/__init__.py b/inspire_dojson/journals/__init__.py index 1add2ab..babc290 100644 --- a/inspire_dojson/journals/__init__.py +++ b/inspire_dojson/journals/__init__.py @@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function -from . import rules # noqa: F401 -from .model import journals # noqa: F401 +from inspire_dojson.journals import rules # noqa: F401 +from inspire_dojson.journals.model import journals # noqa: F401 diff --git a/inspire_dojson/journals/model.py b/inspire_dojson/journals/model.py index aee36e6..4fab0a6 100644 --- a/inspire_dojson/journals/model.py +++ b/inspire_dojson/journals/model.py @@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function -from ..model import FilterOverdo, add_collection, add_schema, clean_record +from inspire_dojson.model import FilterOverdo, add_collection, add_schema, clean_record filters = [ add_schema('journals.json'), diff --git a/inspire_dojson/journals/rules.py b/inspire_dojson/journals/rules.py index c2c8730..bd6743f 100644 --- a/inspire_dojson/journals/rules.py +++ b/inspire_dojson/journals/rules.py @@ -29,8 +29,8 @@ from inspire_utils.date import normalize_date from inspire_utils.helpers import force_list, maybe_int -from ..utils import get_record_ref -from .model import journals +from inspire_dojson.journals.model import journals +from inspire_dojson.utils import get_record_ref @journals.over('issns', '^022..') diff --git a/inspire_dojson/model.py b/inspire_dojson/model.py index 6e2cccf..318e57a 100644 --- a/inspire_dojson/model.py +++ b/inspire_dojson/model.py @@ -34,8 +34,8 @@ from dojson.errors import IgnoreKey from six import raise_from -from .errors import DoJsonError -from .utils import dedupe_all_lists, strip_empty_values +from inspire_dojson.errors import DoJsonError +from inspire_dojson.utils import dedupe_all_lists, strip_empty_values class FilterOverdo(Overdo): diff --git a/run-tests.sh b/run-tests.sh index 0258522..ac5a34c 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -22,4 +22,5 @@ set -e +flake8 inspire_dojson tests py.test tests diff --git a/tests/conftest.py b/tests/conftest.py index 22c12d4..ae40096 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -39,7 +39,7 @@ def app(): yield app -@pytest.fixture(scope='function') +@pytest.fixture() def stable_langdetect(app): """Ensure that ``langdetect`` always returns the same thing. diff --git a/tests/test_hepnames.py b/tests/test_hepnames.py index f40844c..7aa076d 100644 --- a/tests/test_hepnames.py +++ b/tests/test_hepnames.py @@ -235,7 +235,7 @@ @pytest.mark.parametrize( - 'test_name,xml_snippet,expected_json,expected_marc', + ('test_name', 'xml_snippet', 'expected_json', 'expected_marc'), EXPERIMENTS_DATA, ids=[test_data[0] for test_data in EXPERIMENTS_DATA], )