Merge branch 'branch-2.10.8' into backport/patch-2.10.8

# Conflicts:
#	.github/workflows/cypress.yml
#	.github/workflows/flake8.yml
#	.github/workflows/pyright.yml
#	ckan/logic/schema.py
#	ckan/public-bs3/base/javascript/client.js
#	ckan/templates-bs3/admin/config.html
#	ckan/templates-bs3/admin/index.html
#	ckan/templates-bs3/footer.html
#	ckan/templates-bs3/package/search.html
#	ckan/templates/snippets/search_form.html
#	ckanext/datatablesview/blueprint.py
#	test-core.ini
### RESOLVED.

Author: JVickery-TBS

.circleci/config.yml

@@ -69,6 +69,7 @@ jobs:
       - <<: *install_deps
       - run: |
           # Python Dependencies
+          pip install -r requirement-setuptools.txt
           pip install -r requirements.txt
           pip install -r dev-requirements.txt
           python setup.py develop

.flake8

@@ -6,6 +6,8 @@ exclude =
         ./bin
 per-file-ignores =
                  test_*.py:E501
+                 ckan/lib/helpers.py:F824
+                 ckan/lib/jobs.py:F824
 extend-exclude =
                ckan/__init__.py,ckan/config/middleware.py
                ckan/lib/app_globals.py

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
@@ -55,7 +55,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/cypress.yml

@@ -1,10 +1,11 @@
 name: Cypress
 on:
-  workflow_dispatch:  # (canada fork only): disable Core repo workflows
-# on: [pull_request]
+#  pull_request:
+  workflow_call:
+  workflow_dispatch:
 env:
   NODE_VERSION: '16'
-  PYTHON_VERSION: '3.8'
+  PYTHON_VERSION: '3.9'
 
 permissions:
   contents: read
@@ -13,8 +14,8 @@ jobs:
   cypress:
     runs-on: ubuntu-latest
     services:
-      ckan-postgres:
-        image: postgres:10
+      ckan_postgres:
+        image: postgres:15
         ports:
           - 5432:5432
         options: >-
@@ -27,12 +28,12 @@ jobs:
           POSTGRES_PASSWORD: pass
           POSTGRES_DB: ckan_test
 
-      ckan-redis:
+      ckan_redis:
         image: redis
         ports:
           - 6379:6379
-      ckan-solr:
-        image: ckan/ckan-solr:master
+      ckan_solr:
+        image: ckan/ckan-solr:2.10-solr9
         ports:
           - 8983:8983
 
@@ -46,30 +47,39 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'pip'
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
 
       - name: Install python deps
-        run: pip install -r requirements.txt -r dev-requirements.txt -e.
+        run: |
+         pip install -U pip
+         pip install -r requirements.txt -r dev-requirements.txt -e.
+         pip check
 
       - name: Init environment
         run: |
-          ckan -c test-core-cypress.ini db init
+          ckan -c test-core-ci.ini db init
+          #cypress testing requires activity plugin to be active
+          ckan config-tool test-core-ci.ini "ckan.plugins = activity"
 
       - name: Run Cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
-          start: ckan -c test-core-cypress.ini run
+          start: ckan -c test-core-ci.ini run
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
-      # Test run video was always captured, so this action uses "always()" condition
-      - uses: actions/upload-artifact@v1
-        if: always()
+          if-no-files-found: ignore
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
         with:
           name: cypress-videos
           path: cypress/videos
+          if-no-files-found: ignore

.github/workflows/docs.yml

@@ -0,0 +1,33 @@
+name: Docs
+on:
+  workflow_call:
+  workflow_dispatch:
+env:
+  PYTHON_VERSION: '3.9'
+
+permissions:
+  contents: read
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history, including tags
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'pip'
+
+      - name: Install python deps
+        run: |
+         pip install -U pip
+         pip install -r requirements.txt -r dev-requirements.txt -e .
+         pip check
+
+      - name: Create Docs
+        run: |
+           sphinx-build doc build/sphinx

.github/workflows/flake8.yml

@@ -1,7 +1,8 @@
 name: Lint
 on:
-  workflow_dispatch:  # (canada fork only): disable Core repo workflows
-# on: [pull_request]
+#  pull_request:
+  workflow_call:
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -10,8 +11,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Install requirements

.github/workflows/publish-pypi.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   build:
+    if: github.repository == 'ckan/ckan'
     name: Build distribution
     runs-on: ubuntu-latest
     steps:
@@ -48,3 +49,10 @@ jobs:
         path: dist/
     - name: Publish distribution to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
+
+  publishSkipped:
+    if: github.repository != 'ckan/ckan'
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          echo "## Skipping PyPI publish on downstream repository" >> $GITHUB_STEP_SUMMARY

.github/workflows/publish-test-pypi.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   build:
+    if: github.repository == 'ckan/ckan'
     name: Build distribution
     runs-on: ubuntu-latest
     steps:
@@ -54,3 +55,10 @@ jobs:
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         repository-url: https://test.pypi.org/legacy/
+
+  publishSkipped:
+    if: github.repository != 'ckan/ckan'
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          echo "## Skipping PyPI publish on downstream repository" >> $GITHUB_STEP_SUMMARY

.github/workflows/pyright.yml

@@ -1,10 +1,11 @@
 name: Check types
 on:
-  workflow_dispatch:  # (canada fork only): disable Core repo workflows
-# on: [pull_request]
+#  pull_request:
+  workflow_call:
+  workflow_dispatch:
 env:
-  NODE_VERSION: '16'
-  PYTHON_VERSION: '3.8'
+  NODE_VERSION: '18'
+  PYTHON_VERSION: '3.9'
 
 permissions:
   contents: read
@@ -17,9 +18,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'pip'
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
       - name: Install python deps
         run: pip install -r requirements.txt -r dev-requirements.txt -e.
       - name: Install node deps