Merge pull request #8 from qld-gov-au/QOLDEV-1012-ckanext-harvest

QOLDEV-1012 merge from upstream to add CKAN 2.11 support

.github/workflows/test.yml

@@ -4,10 +4,10 @@ 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'
+          python-version: '3.9'
       - name: Install requirements
         run: pip install flake8 pycodestyle
       - name: Check syntax
@@ -19,16 +19,23 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        ckan-version: ["2.10", 2.9, 2.9-py2, 2.8, 2.7]
+        include:
+          - ckan-version: "2.11"
+            ckan-image: "ckan/ckan-dev:2.11-py3.10"
+          - ckan-version: "2.10"
+            ckan-image: "ckan/ckan-dev:2.10-py3.10"
+          - ckan-version: "2.9"
+            ckan-image: "ckan/ckan-dev:2.9-py3.9"
       fail-fast: false
 
     name: CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     container:
-      image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
+      image: ${{ matrix.ckan-image }}
+      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:
@@ -46,23 +53,21 @@ jobs:
       CKAN_REDIS_URL: redis://redis:6379/1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install requirements
       run: |
         pip install -r requirements.txt
         pip install -r dev-requirements.txt
         pip install -e .
         # Replace default path to CKAN core config file with the one on the container
         sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
+    - name: Install requirements (2.9)
+      run: |
+        pip install -U pytest-rerunfailures
+      if: ${{ matrix.ckan-version == '2.9' }}
     - name: Setup extension (CKAN >= 2.9)
-      if: ${{ matrix.ckan-version != '2.7' && matrix.ckan-version != '2.8' }}
       run: |
         ckan -c test.ini db init
-        ckan -c test.ini harvester initdb
-    - name: Setup extension (CKAN < 2.9)
-      if: ${{ matrix.ckan-version == '2.7' || matrix.ckan-version == '2.8' }}
-      run: |
-        paster --plugin=ckan db init -c test.ini
-        paster --plugin=ckanext-harvest harvester initdb -c test.ini
+        ckan -c test.ini db pending-migrations --apply
     - name: Run tests
       run: pytest --ckan-ini=test.ini --cov=ckanext.harvest --disable-warnings ckanext/harvest/tests

CHANGELOG.rst

@@ -7,9 +7,98 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <http://keepachangelog.com>`_
 and this project adheres to `Semantic Versioning <http://semver.org/>`_
 
+
+***********
+1.6.0_ - 2024-10-31
+***********
+
+Changed
+_______
+
+- CKAN 2.11 support #551
+- Switched to alembic migrations #540
+- Support for SQLAlchemy 2 #553
+- Use pyproject.toml file #554
+- Add tab for harvest sources in sysadmin page
+
+Fixed
+-------
+
+- Clean up harvest source clear command, fix revisions exception #556
+- Convert boolean values to bools #544
+
+
+***********
+1.5.6_ - 2023-06-26
+***********
+
+Fixed
+-------
+
+- Fix url endpoint for job_show #534
+
+***********
+1.5.5_ - 2023-06-05
+***********
+
+Fixed
+-------
+
+- Fix display of harvest job errors #533
+
+***********
+1.5.4_ - 2023-05-23
+***********
+
+Fixed
+-------
+
+- Fix a problem with data-dictization when using sqlalchemy 1.4+ #529
+
+***********
+1.5.3_ - 2023-04-03
+***********
+
+Fixed
+-------
+
+- Fix asset path in MANIFEST.in #525
+
+***********
+1.5.2_ - 2023-03-28
+***********
+
+Fixed
+-------
+
+- Fix URL endpoints: from ``harvest.object_show`` to ``harvester.object_show`` #524
+
 ***********
-Unreleased_
+1.5.1_ - 2023-03-22
+***********
+
+Fixed
+-------
+
+- Fix ``url_for`` routing to point to harvester blueprint #523
+
 ***********
+1.5.0_ - 2023-03-16
+***********
+
+Changed
+-------
+
+- Added unescape for email text body to avoid encoded characters #517
+- Pick the right harvest_object_id if there are multiple #519
+- Do not duplicate harvest_extras if exist in root schema #521
+- Use 403 when actions are forbidden, not 401 #522
+- Drop support old versions #520
+
+Breaking Changes
+-------
+- ``h.bootstrap_version()`` no longer exist since it is no longer needed to inject CSS classes
+- Support for old Pylon's route syntax has been removed. Example: calling ``url_for("harvest_read")`` will no longer work. URLs for ``ckanext-harvest`` needs to respect Flask's syntax: ``url_for("harvest.read")``, etc
 
 ***********
 1.4.2_ - 2023-01-12
@@ -345,7 +434,20 @@ Categories
 - ``Fixed`` for any bug fixes.
 - ``Security`` to invite users to upgrade in case of vulnerabilities.
 
-.. _Unreleased: https://github.com/ckan/ckanext-harvest/compare/v1.3.2...HEAD
+.. _Unreleased: https://github.com/ckan/ckanext-harvest/compare/v1.6.0...HEAD
+.. _1.6.0: https://github.com/ckan/ckanext-harvest/compare/v1.5.6...v1.6.0
+.. _1.5.6: https://github.com/ckan/ckanext-harvest/compare/v1.5.5...v1.5.6
+.. _1.5.5: https://github.com/ckan/ckanext-harvest/compare/v1.5.4...v1.5.5
+.. _1.5.4: https://github.com/ckan/ckanext-harvest/compare/v1.5.3...v1.5.4
+.. _1.5.3: https://github.com/ckan/ckanext-harvest/compare/v1.5.2...v1.5.3
+.. _1.5.2: https://github.com/ckan/ckanext-harvest/compare/v1.5.1...v1.5.2
+.. _1.5.1: https://github.com/ckan/ckanext-harvest/compare/v1.5.0...v1.5.1
+.. _1.5.0: https://github.com/ckan/ckanext-harvest/compare/v1.4.2...v1.5.0
+.. _1.4.2: https://github.com/ckan/ckanext-harvest/compare/v1.4.1...v1.4.2
+.. _1.4.1: https://github.com/ckan/ckanext-harvest/compare/v1.4.0...v1.4.1
+.. _1.4.0: https://github.com/ckan/ckanext-harvest/compare/v1.3.4...v1.4.0
+.. _1.3.4: https://github.com/ckan/ckanext-harvest/compare/v1.3.3...v1.3.4
+.. _1.3.3: https://github.com/ckan/ckanext-harvest/compare/v1.3.2...v1.3.3
 .. _1.3.2: https://github.com/ckan/ckanext-harvest/compare/v1.3.1...v1.3.2
 .. _1.3.1: https://github.com/ckan/ckanext-harvest/compare/v1.3.0...v1.3.1
 .. _1.3.0: https://github.com/ckan/ckanext-harvest/compare/v1.2.1...v1.3.0

MANIFEST.in

@@ -1,4 +1,4 @@
 recursive-include ckanext/harvest/templates *
-recursive-include ckanext/harvest/fanstatic_library *
+recursive-include ckanext/harvest/assets *
 recursive-include ckanext/harvest/public *
 recursive-include ckanext/harvest/i18n *