From e148fce040b874c7dd397cb22118a3c03b7f02d4 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 2 Nov 2021 15:01:39 -0700 Subject: re-fmt all the fatcat_tools __init__ files for readability --- python/fatcat_tools/harvest/__init__.py | 6 ++-- python/fatcat_tools/importers/__init__.py | 56 +++++++++++++++++++++--------- python/fatcat_tools/reviewers/__init__.py | 3 +- python/fatcat_tools/transforms/__init__.py | 18 +++++++--- python/fatcat_tools/workers/__init__.py | 9 +++-- 5 files changed, 62 insertions(+), 30 deletions(-) (limited to 'python/fatcat_tools') diff --git a/python/fatcat_tools/harvest/__init__.py b/python/fatcat_tools/harvest/__init__.py index b3757a7d..1645778a 100644 --- a/python/fatcat_tools/harvest/__init__.py +++ b/python/fatcat_tools/harvest/__init__.py @@ -1,6 +1,4 @@ - -from .harvest_common import HarvestState from .doi_registrars import HarvestCrossrefWorker, HarvestDataciteWorker -from .oaipmh import HarvestArxivWorker, HarvestDoajArticleWorker, \ - HarvestDoajJournalWorker +from .harvest_common import HarvestState +from .oaipmh import HarvestArxivWorker, HarvestDoajArticleWorker, HarvestDoajJournalWorker from .pubmed import PubmedFTPWorker diff --git a/python/fatcat_tools/importers/__init__.py b/python/fatcat_tools/importers/__init__.py index a2224081..06ecfd58 100644 --- a/python/fatcat_tools/importers/__init__.py +++ b/python/fatcat_tools/importers/__init__.py @@ -1,4 +1,3 @@ - """ To run an import you combine two classes; one each of: @@ -12,25 +11,48 @@ To run an import you combine two classes; one each of: """ -from .common import EntityImporter, JsonLinePusher, LinePusher, CsvPusher, SqlitePusher, Bs4XmlFilePusher, Bs4XmlLargeFilePusher, Bs4XmlLinesPusher, Bs4XmlFileListPusher, KafkaJsonPusher, KafkaBs4XmlPusher, make_kafka_consumer, clean, is_cjk, LANG_MAP_MARC -from .crossref import CrossrefImporter, CROSSREF_TYPE_MAP, lookup_license_slug -from .datacite import DataciteImporter -from .jalc import JalcImporter -from .jstor import JstorImporter +from .arabesque import ARABESQUE_MATCH_WHERE_CLAUSE, ArabesqueMatchImporter from .arxiv import ArxivRawImporter -from .pubmed import PubmedImporter +from .cdl_dash_dat import auto_cdl_dash_dat +from .chocula import ChoculaImporter +from .common import ( + LANG_MAP_MARC, + Bs4XmlFileListPusher, + Bs4XmlFilePusher, + Bs4XmlLargeFilePusher, + Bs4XmlLinesPusher, + CsvPusher, + EntityImporter, + JsonLinePusher, + KafkaBs4XmlPusher, + KafkaJsonPusher, + LinePusher, + SqlitePusher, + clean, + is_cjk, + make_kafka_consumer, +) +from .crossref import CROSSREF_TYPE_MAP, CrossrefImporter, lookup_license_slug +from .datacite import DataciteImporter +from .dblp_container import DblpContainerImporter +from .dblp_release import DblpReleaseImporter +from .doaj_article import DoajArticleImporter +from .file_meta import FileMetaImporter +from .fileset_generic import FilesetImporter from .grobid_metadata import GrobidMetadataImporter +from .ingest import ( + IngestFileResultImporter, + IngestFilesetResultImporter, + IngestWebResultImporter, + SavePaperNowFileImporter, + SavePaperNowFilesetImporter, + SavePaperNowWebImporter, +) +from .jalc import JalcImporter from .journal_metadata import JournalMetadataImporter -from .chocula import ChoculaImporter +from .jstor import JstorImporter from .matched import MatchedImporter from .orcid import OrcidImporter -from .arabesque import ArabesqueMatchImporter, ARABESQUE_MATCH_WHERE_CLAUSE -from .wayback_static import auto_wayback_static -from .cdl_dash_dat import auto_cdl_dash_dat -from .ingest import IngestFileResultImporter, SavePaperNowFileImporter, IngestWebResultImporter, SavePaperNowWebImporter, IngestFilesetResultImporter, SavePaperNowFilesetImporter +from .pubmed import PubmedImporter from .shadow import ShadowLibraryImporter -from .file_meta import FileMetaImporter -from .doaj_article import DoajArticleImporter -from .dblp_release import DblpReleaseImporter -from .dblp_container import DblpContainerImporter -from .fileset_generic import FilesetImporter +from .wayback_static import auto_wayback_static diff --git a/python/fatcat_tools/reviewers/__init__.py b/python/fatcat_tools/reviewers/__init__.py index edd56e9f..0ed4d0a1 100644 --- a/python/fatcat_tools/reviewers/__init__.py +++ b/python/fatcat_tools/reviewers/__init__.py @@ -1,2 +1 @@ - -from .review_common import ReviewBot, EditCheck, CheckResult, DummyReviewBot +from .review_common import CheckResult, DummyReviewBot, EditCheck, ReviewBot diff --git a/python/fatcat_tools/transforms/__init__.py b/python/fatcat_tools/transforms/__init__.py index 7cc8f699..f02b1e7d 100644 --- a/python/fatcat_tools/transforms/__init__.py +++ b/python/fatcat_tools/transforms/__init__.py @@ -1,5 +1,15 @@ - -from .entities import entity_to_dict, entity_from_json, entity_from_dict, entity_from_toml, entity_to_toml -from .elasticsearch import release_to_elasticsearch, container_to_elasticsearch, changelog_to_elasticsearch, file_to_elasticsearch -from .csl import release_to_csl, citeproc_csl +from .csl import citeproc_csl, release_to_csl +from .elasticsearch import ( + changelog_to_elasticsearch, + container_to_elasticsearch, + file_to_elasticsearch, + release_to_elasticsearch, +) +from .entities import ( + entity_from_dict, + entity_from_json, + entity_from_toml, + entity_to_dict, + entity_to_toml, +) from .ingest import release_ingest_request diff --git a/python/fatcat_tools/workers/__init__.py b/python/fatcat_tools/workers/__init__.py index 32fd330d..18b35b2b 100644 --- a/python/fatcat_tools/workers/__init__.py +++ b/python/fatcat_tools/workers/__init__.py @@ -1,4 +1,7 @@ - from .changelog import ChangelogWorker, EntityUpdatesWorker -from .elasticsearch import ElasticsearchReleaseWorker, ElasticsearchContainerWorker, ElasticsearchChangelogWorker -from .worker_common import most_recent_message, FatcatWorker +from .elasticsearch import ( + ElasticsearchChangelogWorker, + ElasticsearchContainerWorker, + ElasticsearchReleaseWorker, +) +from .worker_common import FatcatWorker, most_recent_message -- cgit v1.2.3