Merge pull request #125 from categulario/fix-container

import syntax and ckanserviceprovider version

Thanks @categulario for your valuable contribution!

datapusher/config.py

@@ -68,21 +68,21 @@ class DataPusherPlusConfig(MutableMapping):
 
     PREFER_DMY: bool = False
     PREVIEW_ROWS: int = 0
-    
+
     AUTO_INDEX_THRESHOLD: int = 3
     AUTO_UNIQUE_INDEX:bool = True
     AUTO_INDEX_DATES: bool = True
-    
+
     SORT_AND_DUPE_CHECK: bool = True
     DEDUP: bool = False
     DEFAULT_EXCEL_SHEET: int = 0
-    
+
     UNSAFE_PREFIX: str = "unsafe_"
     RESERVED_COLNAMES: str = "_id"
-        
+
     ADD_SUMMARY_STATS_RESOURCE: bool = False
     SUMMARY_STATS_OPTIONS: str = ""
-    
+
     AUTO_ALIAS: bool = True
     AUTO_ALIAS_UNIQUE: bool = False
 

datapusher/jobs.py

@@ -29,7 +29,7 @@
 
 # CKAN-related imports
 from ckanserviceprovider import web
-from datapusher.config import config
+from .config import config
 
 
 if locale.getdefaultlocale()[0]:
@@ -372,7 +372,7 @@ def push_to_datastore(task_id, input, dry_run=False):
     with tempfile.TemporaryDirectory() as temp_dir:
         return _push_to_datastore(task_id, input, dry_run=dry_run, temp_dir=temp_dir)
 
-    
+
 def _push_to_datastore(task_id, input, dry_run=False, temp_dir=None):
     handler = util.StoringHandler(task_id, input)
     logger = logging.getLogger(task_id)
@@ -669,7 +669,7 @@ def _push_to_datastore(task_id, input, dry_run=False, temp_dir=None):
         # using uchardet to determine encoding
         file_encoding = subprocess.run(
                         [
-                            "uchardet", 
+                            "uchardet",
                             tmp.name
                         ],
                         check=True,

datapusher/main.py

@@ -1,8 +1,8 @@
 import os
 import ckanserviceprovider.web as web
 
-from datapusher import jobs
-from config import config
+from . import jobs
+from .config import config
 
 # check whether jobs have been imported properly
 assert jobs.push_to_datastore

setup.py

@@ -59,7 +59,7 @@
     install_requires=[
         "APScheduler == 3.9.1.post1",
         "python-dotenv",
-        'ckanserviceprovider == 1.1.0',
+        'ckanserviceprovider == 1.2.0',
         'requests',
         "psycopg2-binary",
         'datasize',