Merge pull request #146 from qld-gov-au/develop

Develop to master

.ahoy.yml

@@ -66,7 +66,9 @@ commands:
 
   logs:
     usage: Show Docker logs.
-    cmd: sh bin/docker-compose.sh logs "$@"
+    cmd: |
+        ahoy title "Output logs"
+        sh bin/docker-compose.sh logs "$@"
 
   pull:
     usage: Pull latest docker images.

.docker/test.ini

@@ -86,6 +86,7 @@ ckan.auth.create_user_via_api = false
 ckan.auth.create_user_via_web = true
 ckan.auth.roles_that_cascade_to_sub_groups = admin
 ckan.auth.public_user_details = True
+ckan.auth.reveal_private_datasets = True
 
 ## Plugins Settings
 

.env

@@ -13,7 +13,7 @@
 PROJECT="ckanext-qgov"
 
 # Docker Compose project name. All containers will have this name.
-COMPOSE_PROJECT_NAME="$PROJECT"
+COMPOSE_PROJECT_NAME="ckanext-qgov"
 
 # Flag to allow code linting failures. 0=enforce, 1=ignore
 ALLOW_LINT_FAIL=0

.github/workflows/test.yml

@@ -7,12 +7,13 @@ on:
       - master
 
 jobs:
+  # Quick check so we don't waste minutes if there's a Flake8 error
   lint:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Install requirements
@@ -23,20 +24,24 @@ jobs:
   test:
     needs: lint
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         ckan-version: ["2.10"]
         ckan-type: ['vanilla', 'custom']
 
     name: CKAN ${{ matrix.ckan-version }} ${{ matrix.ckan-type }}
     runs-on: ubuntu-latest
-    container: drevops/ci-builder:23.7.0
+    container: drevops/ci-runner:23.12.0
     env:
       CKAN_VERSION: ${{ matrix.ckan-version }}
       CKAN_TYPE: ${{ matrix.ckan-type }}
 
     steps:
-      - uses: actions/checkout@v3
+      # Patch https://github.com/actions/runner/issues/863
+      - name: Preserve $HOME set in the container
+        run: echo HOME=/root >> "$GITHUB_ENV"
+
+      - uses: actions/checkout@v4
         timeout-minutes: 2
 
       - name: Build
@@ -58,12 +63,12 @@ jobs:
         timeout-minutes: 30
 
       - name: Retrieve logs
-        if: failure()
+        if: always()
         run: ahoy logs
-        timeout-minutes: 5
+        timeout-minutes: 1
 
       - name: Retrieve screenshots
-        if: failure()
+        if: always()
         run: bin/process-artifacts.sh
         timeout-minutes: 1
 

ckanext/qgov/common/plugin.py

@@ -22,9 +22,6 @@
 from .user_creation import validators as user_creation_validators
 from .user_creation.logic.actions import create as user_creation_create_actions
 
-# workaround for https://github.com/ckan/ckan/issues/6678
-from ckan.views import dataset as dataset_view, resource  # noqa: F401
-
 LOG = getLogger(__name__)
 
 IP_ADDRESS = re.compile(r'^({0}[.]){{3}}{0}$'.format(r'[0-9]{1,3}'))
@@ -179,9 +176,8 @@ def get_blueprint(self):
         user to the `came_from` URL if they are logged in.
         :return:
         """
-        from .views import user, dataset, assets
+        from .views import user, assets
         blueprints = user.get_blueprints()
-        blueprints.extend(dataset.get_blueprints())
         blueprints.extend(assets.get_blueprints())
         return blueprints