CKAN 2.11 migration

.github/workflows/test.yml

@@ -3,45 +3,28 @@ on: [pull_request]
 jobs:
   lint:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ 2.7, 3.9 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.10"
       - name: Install requirements
         run: pip install flake8 pycodestyle
       - name: Check syntax
         run: |
           flake8 . --count --max-line-length=127 --show-source --statistics
 
   test:
-    name: CKAN
+    name: CKAN 2.11
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ckan-container-version: "2.9-py2"
-            ckan-postgres-version: "2.9"
-            ckan-solr-version: "2.9-solr8"
-          - ckan-container-version: "2.9"
-            ckan-postgres-version: "2.9"
-            ckan-solr-version: "2.9-solr8"
-          - ckan-container-version: "2.10"
-            ckan-postgres-version: "2.10"
-            ckan-solr-version: "2.10"
-
     container:
-      image: openknowledge/ckan-dev:${{ matrix.ckan-container-version }}
+      image: ckan/ckan-dev:2.11-py3.10
+      options: --user root
     services:
       solr:
-        image: ckan/ckan-solr:${{ matrix.ckan-solr-version }}
+        image: ckan/ckan-solr:2.11-solr9
       postgres:
-        image: ckan/ckan-postgres-dev:${{ matrix.ckan-postgres-version }}
+        image: ckan/ckan-postgres-dev:2.11
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -57,7 +40,7 @@ jobs:
       CKAN_REDIS_URL: redis://redis:6379/1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Install requirements
       run: |
         pip install -r requirements.txt
@@ -70,8 +53,5 @@ jobs:
         ckan -c test.ini db init
         ckan -c test.ini versions initdb
     - name: Run tests
-      run: pytest --ckan-ini=test.ini --cov=ckanext.versions --cov-report=xml --cov-append --disable-warnings ckanext/versions/tests
-    - name: Upload coverage report to codecov
-      uses: codecov/codecov-action@v1
-      with:
-        file: ./coverage.xml
+      run: |
+        pytest --ckan-ini=test.ini --cov=ckanext.versions --disable-warnings ckanext/versions/tests/

ckanext/versions/logic/action.py

@@ -12,6 +12,16 @@
 
 from ckanext.versions.model import Version
 
+# Activity import for different CKAN versions
+# CKAN 2.10+ moved Activity to a separate plugin
+try:
+    from ckanext.activity.model import Activity
+except ImportError:
+    try:
+        from ckan.model import Activity
+    except ImportError:
+        Activity = core_model.Activity
+
 log = logging.getLogger(__name__)
 
 
@@ -107,9 +117,9 @@ def resource_version_create(context, data_dict):
             site_id = toolkit.config.get('ckan.site_id', 'ckan_site_user')
             creator_user_id = model.User.get(site_id).id
 
-    activity = model.Session.query(model.Activity). \
+    activity = model.Session.query(Activity). \
         filter_by(object_id=resource.package_id). \
-        order_by(model.Activity.timestamp.desc()). \
+        order_by(Activity.timestamp.desc()). \
         first()
 
     if not activity:
@@ -446,10 +456,8 @@ def resource_view_list(up_func, context, data_dict):
     '''
     resource_views = up_func(context, data_dict)
 
-    versions_views = []
-    for i, view in enumerate(resource_views):
-        if view['view_type'] == 'versions_view':
-            versions_views.append(resource_views.pop(i))
+    versions_views = [view for view in resource_views if view['view_type'] == 'versions_view']
+    resource_views = [view for view in resource_views if view['view_type'] != 'versions_view']
 
     resource_views.extend(versions_views)
 

ckanext/versions/logic/dataset_version_action.py

@@ -9,6 +9,16 @@
 from ckanext.versions.logic.action import version_show
 from ckanext.versions.model import Version
 
+# Activity import for different CKAN versions
+# CKAN 2.10+ moved Activity to a separate plugin
+try:
+    from ckanext.activity.model import Activity
+except ImportError:
+    try:
+        from ckan.model import Activity
+    except ImportError:
+        Activity = core_model.Activity
+
 log = logging.getLogger(__name__)
 
 
@@ -48,11 +58,11 @@ def dataset_version_create(context, data_dict):
     creator_user_id = context['auth_user_obj'].id
 
     if activity_id:
-        activity = model.Activity.get(activity_id)
+        activity = Activity.get(activity_id)
     else:
-        activity = model.Session.query(model.Activity). \
+        activity = model.Session.query(Activity). \
             filter_by(object_id=dataset_id). \
-            order_by(model.Activity.timestamp.desc()). \
+            order_by(Activity.timestamp.desc()). \
             first()
     if not activity:
         raise toolkit.ObjectNotFound('Activity not found')

ckanext/versions/model.py

@@ -44,8 +44,16 @@ def as_dict(self):
 
 
 def create_tables():
-    Version.__table__.create()
+    from ckan.model import meta
+    Version.__table__.create(bind=meta.engine, checkfirst=True)
 
 
 def tables_exist():
-    return Version.__table__.exists()
+    from ckan.model import meta
+    try:
+        engine = meta.engine
+        if engine is None:
+            return False
+        return Version.__table__.exists(bind=engine)
+    except (AttributeError, TypeError):
+        return False

ckanext/versions/plugin.py

@@ -68,7 +68,7 @@ def get_auth_functions(self):
             'version_delete': auth.version_delete,
             'version_list': auth.version_list,
             'version_show': auth.version_show,
-            'resource_version_clear': action.resource_version_clear,
+            'resource_version_clear': auth.resource_version_clear,
         }
 
     # ITemplateHelpers

ckanext/versions/tests/fixtures.py

@@ -1,5 +1,6 @@
 import pytest
 
+from ckan import model
 from ckan.tests import factories
 from ckanext.versions.tests import create_version, versions_db_setup
 
@@ -9,6 +10,23 @@ def versions_setup():
     versions_db_setup()
 
 
+@pytest.fixture
+def clean_db_with_migrations(clean_db):
+    """
+    Extends clean_db fixture to add CKAN 2.11 activity plugin schema.
+
+    The activity plugin in CKAN 2.11 requires a permission_labels column
+    in the activity table. This fixture ensures the column exists after
+    clean_db resets the database.
+    """
+    # After clean_db runs, add the permission_labels column
+    connection = model.Session.connection()
+    connection.execute(
+        "ALTER TABLE activity ADD COLUMN IF NOT EXISTS permission_labels text[];"
+    )
+    model.Session.commit()
+
+
 @pytest.fixture()
 def org_admin():
     return factories.User(name="admin")