Merge branch 'master' into use-api-tokens-for-jobs

.github/workflows/test.yml

@@ -52,7 +52,6 @@ jobs:
     - name: Install requirements
       run: |
         pip install -r requirements.txt
-        pip install -r pip-requirements.txt
         pip install -r dev-requirements.txt
         pip install -e .
         pip install -U requests[security]

ckanext/xloader/loader.py

@@ -73,6 +73,8 @@ def load_csv(csv_filepath, resource_id, mimetype='text/csv', logger=None):
     except csv.Error:
         logger.warning('Could not determine delimiter from file, use default ","')
         delimiter = ','
+    except UnicodeDecodeError:
+        raise LoaderError('Could not detect delimiter in this file')
 
     # Setup the converters that run when you iterate over the row_set.
     # With pgloader only the headers will be iterated over.

requirements.txt

@@ -1,3 +1,5 @@
+ckantoolkit
 messytables==0.15.2
+requests[security]>=2.11.1
+six>=1.12.0
 Unidecode==1.0.22
-six>=1.12.0