Skip to content

Commit b61562c

Browse files
committed
isort lint
1 parent 8cfe987 commit b61562c

File tree

9 files changed

+24
-26
lines changed

9 files changed

+24
-26
lines changed

harvester/__init__.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@
2222
# TODO these imports will need to be updated to ensure a consistent api
2323
from .compare import compare
2424
from .extract import download_waf, extract, traverse_waf
25-
from .load import (
26-
create_ckan_package,
27-
dcatus_to_ckan,
28-
load,
29-
patch_ckan_package,
30-
purge_ckan_package,
31-
update_ckan_package,
32-
)
25+
from .load import (create_ckan_package, dcatus_to_ckan, load,
26+
patch_ckan_package, purge_ckan_package, update_ckan_package)
3327
from .transform import transform
3428
from .utils import *
3529
from .validate import *

harvester/load.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import logging
22
import re
3+
34
import ckanapi
5+
46
from harvester.utils.util import sort_dataset
57

68
logger = logging.getLogger("harvester")

harvester/utils/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from . import json
2-
from . import util
1+
from . import json, util
32

43
__all__ = ["json", "util"]

harvester/utils/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import hashlib
2-
import sansjson
32
import json
43

4+
import sansjson
5+
56

67
def sort_dataset(d):
78
return sansjson.sort_pyobject(d)

tests/integration/compare/conftest.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import pytest
2-
from pathlib import Path
31
import os
2+
from pathlib import Path
3+
4+
import pytest
5+
6+
from harvester.load import create_ckan_entrypoint, search_ckan
47
from harvester.utils.json import open_json
5-
from harvester.utils.util import sort_dataset, dataset_to_hash
6-
from harvester.load import search_ckan, create_ckan_entrypoint
8+
from harvester.utils.util import dataset_to_hash, sort_dataset
79

810
TEST_DIR = Path(__file__).parents[2]
911
HARVEST_SOURCES = TEST_DIR / "harvest-sources"

tests/integration/load/ckan/test_ckan_cud_int.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
from harvester.load import (
2-
create_ckan_package,
3-
patch_ckan_package,
4-
purge_ckan_package,
5-
update_ckan_package,
6-
)
1+
from harvester.load import (create_ckan_package, patch_ckan_package,
2+
purge_ckan_package, update_ckan_package)
73

84

95
def test_create_package(ckan_entrypoint, test_ckan_package):

tests/unit/compare/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import pytest
21
from pathlib import Path
2+
3+
import pytest
4+
35
from harvester.utils.json import open_json
4-
from harvester.utils.util import sort_dataset, dataset_to_hash
6+
from harvester.utils.util import dataset_to_hash, sort_dataset
57

68
TEST_DIR = Path(__file__).parents[2]
79
HARVEST_SOURCES = TEST_DIR / "harvest-sources"

tests/unit/compare/test_compare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from harvester.compare import compare
2-
from harvester.utils.util import sort_dataset, dataset_to_hash
2+
from harvester.utils.util import dataset_to_hash, sort_dataset
33

44

55
def test_artificial_compare(artificial_data_sources):

tests/unit/load/ckan/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import os
12
from pathlib import Path
3+
24
import pytest
3-
import os
4-
from harvester.load import dcatus_to_ckan, create_ckan_entrypoint
5+
6+
from harvester.load import create_ckan_entrypoint, dcatus_to_ckan
57
from harvester.utils.json import open_json
68

79
TEST_DIR = Path(__file__).parents[3]

0 commit comments

Comments
 (0)