lint

ckanext/geodatagov/cli.py

@@ -733,6 +733,7 @@ def tracking_update(start_date: Optional[str]):
     tracking.update_tracking_solr = update_tracking_solr
     tracking.update_all(start_date)
 
+
 def update_tracking_solr(start_date: datetime.datetime):
     """copied from ckanext/tracking/cli/tracking.py
        but with customized way of doing solr indexing

ckanext/geodatagov/commands.py

@@ -443,7 +443,6 @@ def clean_deleted(self):
     #  u'dataDictionary': 5841, u'temporal': 5830, u'modified': 5809, u'issued': 5793, u'mbox': 5547,
     #  u'granularity': 4434, u'license': 2048, u'dataQuality': 453}
 
-
     def harvest_job_cleanup(self):
         if p.toolkit.check_ckan_version(min_version='2.8'):
             print('Task removed since new ckanext-harvest include ckan.harvest.timeout to mark as finished stuck jobs')

ckanext/geodatagov/plugin.py

@@ -580,6 +580,7 @@ def get_auth_functions(self):
             'group_catagory_tag_update': geodatagov_auth.group_catagory_tag_update,
         }
 
+
 class S3Test(p.SingletonPlugin):
 
     p.implements(p.IClick)

ckanext/geodatagov/tests/conftest.py

@@ -7,6 +7,7 @@
 def run_once_for_all_tests():
     utils.simple_http_server()
 
+
 @pytest.fixture(scope="class", autouse=True)
 def run_for_every_test_class():
-    utils.reset_db_and_solr()
+    utils.reset_db_and_solr()

ckanext/geodatagov/tests/factories.py

@@ -11,6 +11,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class HarvestSource(factory.Factory):
     FACTORY_FOR = harvest_model.HarvestSource
     _return_type = 'dict'

ckanext/geodatagov/tests/test_category_tags.py

@@ -8,6 +8,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestCategoryTags(object):
 

ckanext/geodatagov/tests/test_datajson.py

@@ -13,6 +13,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestDataJsonHarvester(object):
 

ckanext/geodatagov/tests/test_db_solr_sync.py

@@ -17,6 +17,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestSolrDBSync(object):
 

ckanext/geodatagov/tests/test_fix_packages.py

@@ -6,6 +6,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestFixPkg(object):
 

ckanext/geodatagov/tests/test_fix_spatial.py

@@ -6,6 +6,7 @@
 
 from utils import populate_locations_table
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestSpatialField(object):
 

ckanext/geodatagov/tests/test_json_export.py

@@ -1,6 +1,5 @@
 import logging
 
-from ckan.tests.helpers import reset_db
 from ckan.tests import factories
 
 

ckanext/geodatagov/tests/test_logic.py

@@ -6,6 +6,7 @@
 
 from utils import populate_locations_table
 
+
 class TestLogic(FunctionalTestBase):
 
     def setup_method(self):

ckanext/geodatagov/tests/test_relink.py

@@ -8,7 +8,6 @@
 import ckan.model as model
 import ckan.lib.search as search
 from ckan.tests import factories
-from ckan.tests.helpers import reset_db
 from click.testing import CliRunner
 from ckanext.harvest.model import HarvestObject
 from ckanext.harvest.tests import factories as harvest_factories
@@ -19,6 +18,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class TestRelink(object):
 
     @classmethod

ckanext/geodatagov/tests/test_s3test.py

@@ -10,6 +10,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class TestS3TestCommand(object):
     @pytest.fixture
     def txt_cli_result(self) -> Result:

ckanext/geodatagov/tests/test_sitemap_creation.py

@@ -12,6 +12,7 @@
 
 # TODO - test for output, test checking complete s3 cycle
 
+
 class TestSitemapExport(object):
 
     def create_datasets(self) -> None:

ckanext/geodatagov/tests/test_tracking.py

@@ -10,6 +10,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestTracking(object):
 

ckanext/geodatagov/tests/test_waf-collection.py

@@ -15,6 +15,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestWafCollectionHarvester(object):
 
@@ -23,7 +24,6 @@ def setup_method(self):
 
         self.organization = Organization()
 
-
     def run_gather(self, url, source_config):
 
         sc = json.loads(source_config)

ckanext/geodatagov/tests/test_waf.py

@@ -14,6 +14,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestWafHarvester(object):
 
@@ -23,7 +24,7 @@ def setup_method(self):
         self.organization = Organization()
 
     def run_gather(self, url, source_config):
-        
+
         sc = json.loads(source_config)
 
         source = WafHarvestSourceObj(url=url,

ckanext/geodatagov/tests/test_waf_GMI.py

@@ -12,6 +12,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @pytest.mark.usefixtures("with_plugins")
 class TestWafHarvester(object):
 

ckanext/geodatagov/tests/utils.py

@@ -13,6 +13,7 @@
 
 PORT = 8999
 
+
 def simple_http_server(port=PORT):
     '''Serves test XML files over HTTP'''
 
@@ -41,21 +42,32 @@ class TestServer(socketserver.TCPServer):
         httpd_thread.setDaemon(True)
         httpd_thread.start()
 
+
 def populate_locations_table():
     # download locations.sql.gz if not present
     if not os.path.exists('/tmp/locations.sql.gz'):
-        os.system("wget https://github.com/GSA/datagov-deploy/raw/71936f004be1882a506362670b82c710c64ef796/"
-                "ansible/roles/software/ec2/ansible/files/locations.sql.gz -O /tmp/locations.sql.gz")
+        os.system(
+            "wget https://github.com/GSA/datagov-deploy/raw/71936f004be1882a506362670b82c710c64ef796/"
+            "ansible/roles/software/ec2/ansible/files/locations.sql.gz "
+            "-O /tmp/locations.sql.gz"
+        )
     # echo "Creating locations table"
     os.system("PGPASSWORD=ckan psql -h db -U ckan -d ckan -c 'DROP TABLE IF EXISTS locations;'")
     os.system("PGPASSWORD=ckan psql -h db -U ckan -d ckan -c 'DROP SEQUENCE IF EXISTS locations_id_seq;'")
     os.system("gunzip -c /tmp/locations.sql.gz | PGPASSWORD=ckan psql -h db -U ckan -d ckan -v ON_ERROR_STOP=1")
 
+
 def reset_db_and_solr():
     # https://github.com/ckan/ckan/issues/4764
     # drop extension postgis so we can reset db
     try:
-        os.system("PGPASSWORD=ckan psql -h db -U ckan -d ckan -c 'SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE datname = current_database() AND pid <> pg_backend_pid();'")
+        os.system(
+            "PGPASSWORD=ckan psql -h db -U ckan -d ckan -c "
+            "'SELECT pg_terminate_backend(pg_stat_activity.pid) "
+            " FROM pg_stat_activity WHERE "
+            " datname = current_database() AND"
+            " pid <> pg_backend_pid();'"
+        )
     except Exception:
         pass
     os.system("PGPASSWORD=ckan psql -h db -U ckan -d ckan -c 'drop extension IF EXISTS postgis cascade;'")
@@ -68,6 +80,3 @@ def reset_db_and_solr():
     metadata.create_all(bind=Session.bind)
 
     search.clear_all()
-
-
-