From ddcc10384db651033ef97b8c74a85f0906b5403a Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 10:53:02 +0100 Subject: [PATCH 1/7] Do not run CKAN 2.9 test (is no longer supported) --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3271637d..25142fa4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,8 +24,6 @@ jobs: 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 }} From cd8df774b1cb9f24e6fe2ce39a578831c5d13d3f Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 10:53:27 +0100 Subject: [PATCH 2/7] Avoid -e since it does not properly test MANIFEST.in --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25142fa4..6074749e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: run: | pip install -r requirements.txt pip install -r dev-requirements.txt - pip install -e . + pip install . # 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) From c69b5249a28ef1f3db2318599f9b25c04b5f479b Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 10:59:17 +0100 Subject: [PATCH 3/7] Update README.rst --- README.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 266630f4..942444d3 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ ckanext-harvest - Remote harvesting extension ============================================= -.. image:: https://github.com/ckan/ckanext-harvest/workflows/Tests/badge.svg?branch=master +.. image:: https://github.com/ckan/ckanext-harvest/actions/workflows/test.yml/badge.svg :target: https://github.com/ckan/ckanext-harvest/actions This extension provides a common harvesting framework for ckan extensions @@ -12,9 +12,8 @@ and adds a CLI and a WUI to CKAN to manage harvesting sources and jobs. Installation ============ -This extension requires CKAN v2.0 or later on both the CKAN it is installed -into and the CKANs it harvests. However you are unlikely to encounter a CKAN -running a version lower than 2.0. +This extension requires CKAN 2.10+ to run. However, it can harvest other CKAN instances running +version 2.0+. 1. The harvest extension can use two different backends. You can choose whichever you prefer depending on your needs, but Redis has been found to be more stable From d5e61bb3730787a937b802ce52e77d100a424d18 Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 11:03:18 +0100 Subject: [PATCH 4/7] Bump version to 1.6.1 --- CHANGELOG.rst | 13 +++++++++++++ README.rst | 2 +- pyproject.toml | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1934439c..9084168e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,19 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_ and this project adheres to `Semantic Versioning `_ +*********** +1.6.1_ - 2025-01-14 +*********** + +Changed +_______ + +- CKAN 2.9 is not longer maintained #559 + +Fixed +------- +- Update manifest to include alembic configuration #558 + *********** 1.6.0_ - 2024-10-31 diff --git a/README.rst b/README.rst index 942444d3..baca9aee 100644 --- a/README.rst +++ b/README.rst @@ -912,7 +912,7 @@ To create a new release, follow the following steps: * Determine new release number based on the rules of `semantic versioning `_ * Update the CHANGELOG, especially the link for the "Unreleased" section -* Update the version number in `setup.py` +* Update the version number in `pyproject.toml` * Create a new release on GitHub and add the CHANGELOG of this release as release notes diff --git a/pyproject.toml b/pyproject.toml index 3e858599..e2693838 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "ckanext-harvest" -version = "1.6.0" +version = "1.6.1" description = "Harvesting interface plugin for CKAN, plus harvester for other CKAN sites" authors = [ {name = "Adrià Mercader", email = "amercadero@gmail.com"} From ac1f5fad95e3fd2e3b0ddf229739ec3bfecc0f5d Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 11:08:08 +0100 Subject: [PATCH 5/7] Revert -e install in tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6074749e..25142fa4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: run: | pip install -r requirements.txt pip install -r dev-requirements.txt - pip install . + 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) From 8694658a4d7569449bd0008a111da06bb9485f15 Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 11:11:15 +0100 Subject: [PATCH 6/7] Cleanup test step for CKAN 2.9 --- .github/workflows/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25142fa4..26043c76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,10 +59,6 @@ jobs: 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) run: | ckan -c test.ini db init From 58b3540ba83c8547dd8064318e88d4ca44e9786b Mon Sep 17 00:00:00 2001 From: pdelboca Date: Tue, 14 Jan 2025 11:11:31 +0100 Subject: [PATCH 7/7] Remove Python 3.8 from pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e2693838..a7246eda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ classifiers = [ "Intended Audience :: Developers", "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: GNU Affero General Public License v3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11",