Merge branch 'update-to-frictionless-ckan-mapper' into main

Author: amercader

.github/workflows/test.yml

@@ -49,11 +49,15 @@ jobs:
     - name: Install requirements (Python 3)
       if: ${{ matrix.ckan-version != '2.7' && matrix.ckan-version != '2.8' && matrix.ckan-version != '2.9-py2'}}
       run: |
+        pip install cython
+        pip install cchardet
         pip install -r requirements.txt
         pip install -r dev-requirements.txt
     - name: Install requirements (Python 2)
       if: ${{ matrix.ckan-version == '2.7' || matrix.ckan-version == '2.8' || matrix.ckan-version == '2.9-py2'}}
       run: |
+        pip install cython
+        pip install cchardet
         pip install -r requirements-py2.txt
         pip install -r dev-requirements-py2.txt
     - name: Install requirements (common)

ckanext/datapackager/logic/action/create.py

@@ -6,7 +6,7 @@
 import six
 
 import ckan.plugins.toolkit as toolkit
-from ckan_datapackage_tools import converter
+from frictionless_ckan_mapper import frictionless_to_ckan as converter
 from werkzeug.datastructures import FileStorage
 
 import datapackage
@@ -31,7 +31,7 @@ def package_create_from_datapackage(context, data_dict):
         :py:func:`~ckan.logic.action.get.organization_list` or
         :py:func:`~ckan.logic.action.get.organization_list_for_user` for
         available values (optional)
-    :type owner_org: string
+   :type owner_org: string
     '''
     url = data_dict.get('url')
     upload = data_dict.get('upload')
@@ -41,8 +41,7 @@ def package_create_from_datapackage(context, data_dict):
         raise toolkit.ValidationError(msg)
 
     dp = _load_and_validate_datapackage(url=url, upload=upload)
-
-    dataset_dict = converter.datapackage_to_dataset(dp)
+    dataset_dict = converter.package(dp.to_dict())
 
     owner_org = data_dict.get('owner_org')
     if owner_org:
@@ -138,6 +137,9 @@ def _create_resources(dataset_id, context, resources):
         elif resource.get('path'):
             _create_and_upload_local_resource(context, resource)
         else:
+            # TODO: Investigate why in test_controller the resource['url'] is a list
+            if type(resource['url']) is list:
+                resource['url'] = resource['url'][0]
             toolkit.get_action('resource_create')(context, resource)
 
 

ckanext/datapackager/logic/action/get.py

@@ -1,5 +1,5 @@
 import ckan.plugins.toolkit as toolkit
-from ckan_datapackage_tools import converter
+from frictionless_ckan_mapper import ckan_to_frictionless as converter
 
 
 @toolkit.side_effect_free
@@ -26,4 +26,4 @@ def package_show_as_datapackage(context, data_dict):
     dataset_dict = toolkit.get_action('package_show')(context,
                                                       {'id': dataset_id})
 
-    return converter.dataset_to_datapackage(dataset_dict)
+    return converter.dataset(dataset_dict)

ckanext/datapackager/tests/controllers/test_datapackage.py

@@ -35,7 +35,13 @@ def test_download_datapackage(self, app):
 
         '''
         user = factories.Sysadmin()
-        dataset = factories.Dataset()
+        dataset = factories.Dataset(
+            maintainer = "John Smith",
+            maintainer_email = "jsmith@email.com",
+            license_id = "cc-zero",
+            license_title = "Creative Commons CC Zero License (cc-zero)",
+            license_url = "http://opendefinition.org/licenses/cc-zero/"
+        )
 
         # Add a resource with a linked-to, not uploaded, data file.
         linked_resource = factories.Resource(