Upgrade to CKAN 2.11 and Python 3

.github/workflows/test.yml

@@ -6,13 +6,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
       - name: Install requirements
-        run: pip install flake8 pycodestyle black[python2]==21.12b0 click==8.0.4 isort
-      - name: Check syntax and complexity
-        run: |
-          flake8 . --count --select=C901,E901,E999,F401,F821,F822,F823 --show-source --statistics
+        run: pip install flake8 pycodestyle black isort
+      - name: Check syntax
+        run: flake8 . --count --select=C901,E721,E901,E999,F401,F821,F822,F823,F841 --show-source --statistics --extend-exclude ckan
       - name: Check codestyle
         run: |
           isort --diff --check ckanext/
@@ -22,16 +19,17 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        ckan-version: [2.8, 2.7]
+        ckan-version: ["2.10", "2.11"]
       fail-fast: false
 
     name: CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     container:
-      image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
+      image: ckan/ckan-dev:${{ matrix.ckan-version }}
+      options: --user root
     services:
       solr:
-        image: ckan/ckan-solr:${{ matrix.ckan-version }}
+        image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9
       postgres:
         image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
         env:
@@ -64,10 +62,11 @@ jobs:
 
       - name: Setup extension
         run: |
-          paster --plugin=ckan db init -c test.ini
+          ckan -c test.ini db init
+          ckan -c test.ini db pending-migrations --apply
 
       - name: Run tests
-        run: nosetests --ckan --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.subscribe --cover-inclusive --cover-erase --cover-tests ckanext/subscribe
+        run: pytest --ckan-ini=test.ini --cov=ckanext.subscribe --cov-report=term-missing --cov-append --disable-warnings ckanext/subscribe/tests
 
       - name: Coveralls
         run: |

MANIFEST.in

@@ -2,3 +2,4 @@ include README.rst
 include LICENSE
 include requirements.txt
 recursive-include ckanext/subscribe *.html *.json *.js *.less *.css *.mo
+recursive-include ckanext/subscribe/migration *.ini *.py *.mako

ckanext/__init__.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # this is a namespace package
 try:
     import pkg_resources

ckanext/subscribe/action.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 import datetime
 import logging
 
@@ -79,7 +77,7 @@ def subscribe_signup(context, data_dict):
             raise tk.ValidationError("Invalid reCAPTCHA. Please try again.")
         log.info("reCAPTCHA verification passed.")
 
-    _check_access(u"subscribe_signup", context, data_dict)
+    _check_access("subscribe_signup", context, data_dict)
 
     data = {
         "email": data_dict["email"],
@@ -130,7 +128,7 @@ def subscribe_signup(context, data_dict):
         try:
             email_verification.send_request_email(subscription)
         except MailerException as exc:
-            log.error("Could not email manage code: {}".format(exc))
+            log.error(f"Could not email manage code: {exc}")
             raise
 
     subscription_dict = dictization.dictize_subscription(subscription, context)
@@ -150,7 +148,7 @@ def subscribe_verify(context, data_dict):
     model = context["model"]
     user = context["user"]
 
-    _check_access(u"subscribe_verify", context, data_dict)
+    _check_access("subscribe_verify", context, data_dict)
 
     code = p.toolkit.get_or_bust(data_dict, "code")
     subscription = (
@@ -194,7 +192,7 @@ def subscribe_update(context, data_dict):
     """
     model = context["model"]
 
-    _check_access(u"subscribe_update", context, data_dict)
+    _check_access("subscribe_update", context, data_dict)
 
     id_ = p.toolkit.get_or_bust(data_dict, "id")
     subscription = model.Session.query(Subscription).get(id_)
@@ -218,7 +216,7 @@ def subscribe_list_subscriptions(context, data_dict):
     """
     model = context["model"]
 
-    _check_access(u"subscribe_list_subscriptions", context, data_dict)
+    _check_access("subscribe_list_subscriptions", context, data_dict)
     email = p.toolkit.get_or_bust(data_dict, "email")
 
     subscription_objs = (
@@ -235,19 +233,17 @@ def subscribe_list_subscriptions(context, data_dict):
             subscription["object_name"] = package.name
             subscription["object_title"] = package.title
             subscription["object_link"] = p.toolkit.url_for(
-                controller="package", action="read", id=package.name
+                "dataset.read", id=package.name
             )
         elif group and not group.is_organization:
             subscription["object_name"] = group.name
             subscription["object_title"] = group.title
-            subscription["object_link"] = p.toolkit.url_for(
-                controller="group", action="read", id=group.name
-            )
+            subscription["object_link"] = p.toolkit.url_for("group.read", id=group.name)
         elif group and group.is_organization:
             subscription["object_name"] = group.name
             subscription["object_title"] = group.title
             subscription["object_link"] = p.toolkit.url_for(
-                controller="organization", action="read", id=group.name
+                "organization.read", id=group.name
             )
         subscriptions.append(subscription)
     return subscriptions
@@ -272,7 +268,7 @@ def subscribe_unsubscribe(context, data_dict):
     """
     model = context["model"]
 
-    _check_access(u"subscribe_unsubscribe", context, data_dict)
+    _check_access("subscribe_unsubscribe", context, data_dict)
 
     data = {"email": p.toolkit.get_or_bust(data_dict, "email"), "user": context["user"]}
     if data_dict.get("dataset_id"):
@@ -315,7 +311,7 @@ def subscribe_unsubscribe_all(context, data_dict):
     """
     model = context["model"]
 
-    _check_access(u"subscribe_unsubscribe_all", context, data_dict)
+    _check_access("subscribe_unsubscribe_all", context, data_dict)
 
     data = {"email": p.toolkit.get_or_bust(data_dict, "email"), "user": context["user"]}
 
@@ -340,7 +336,7 @@ def subscribe_request_manage_code(context, data_dict):
     """
     model = context["model"]
 
-    _check_access(u"subscribe_request_manage_code", context, data_dict)
+    _check_access("subscribe_request_manage_code", context, data_dict)
 
     email = data_dict["email"]
 
@@ -356,7 +352,7 @@ def subscribe_request_manage_code(context, data_dict):
     try:
         email_auth.send_manage_email(manage_code, email=email)
     except MailerException as exc:
-        log.error("Could not email manage code: {}".format(exc))
+        log.error(f"Could not email manage code: {exc}")
         raise
 
     return None

ckanext/subscribe/assets/webassets.yml

@@ -0,0 +1,4 @@
+subscribe/css/subscribe:
+  output: subscribe/css/subscribe.css
+  contents:
+    - css/subscribe.css

ckanext/subscribe/auth.py

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 from ckan.plugins.toolkit import _, auth_allow_anonymous_access, check_access
 
 
@@ -19,15 +17,15 @@ def subscribe_signup(context, data_dict):
         group = model.Group.get(group_id)
         check_access("group_show", context, {"id": group.id})
     else:
-        return {"success": False, "msg": _(u"No object specified")}
+        return {"success": False, "msg": _("No object specified")}
 
     if (
         skip_verification
         and skip_verification not in (None, 0, False)
         and skip_verification not in ("false", "f", "no", "n", "0")
     ):
         # sysadmins only
-        return {"success": False, "msg": _(u"Not authorized to skip verification")}
+        return {"success": False, "msg": _("Not authorized to skip verification")}
 
     return {"success": True}