Merge pull request #162 from GSA/ckan-210

CKAN 2.10 + Cypress 12.10.0

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     uses: gsa/data.gov/.github/workflows/ckan-test.yml@main
     with:
       ext_name: datagovtheme
-      plugins: harvest datagovtheme
+      plugins: harvest datagovtheme geodatagov
     secrets: inherit
 
   ui-test:

.gitignore

@@ -11,8 +11,8 @@ syntax: glob
 .vscode/
 
 # Cypress
-e2e/cypress/videos/*
-e2e/cypress/screenshots/*
-e2e/cypress/results/output.xml
+cypress/e2e/videos/*
+cypress/e2e/screenshots/*
+cypress/e2e/results/output.xml
 node_modules
-package-lock.json
+package-lock.json

Dockerfile

@@ -1,11 +1,10 @@
-ARG CKAN_VERSION=2.9
+ARG CKAN_VERSION=2.10.1
 FROM openknowledge/ckan-dev:${CKAN_VERSION}
 ARG CKAN_VERSION
 
-# Add timezone data if it does not exist
-RUN if [[ "${CKAN_VERSION}" = "2.9" ]]; then sudo apk add tzdata; fi
+# Add timezone data
+RUN sudo apk add tzdata
 
 COPY . $APP_DIR/
-# WORKDIR /app
 
 RUN pip install -r $APP_DIR/requirements.txt -r $APP_DIR/dev-requirements.txt -e $APP_DIR/.

Makefile

@@ -1,4 +1,4 @@
-CKAN_VERSION ?= 2.9
+CKAN_VERSION ?= 2.10
 COMPOSE_FILE ?= docker-compose.yml
 
 build: ## Build the  docker containers
@@ -17,6 +17,9 @@ test: ## Run extension tests
 ui-test:
 	CKAN_VERSION=$(CKAN_VERSION) docker-compose -f $(COMPOSE_FILE) -f docker-compose.test.yml up --abort-on-container-exit test
 
+ui-interactive:
+	CYPRESS_BASE_URL=http://ckan:5000 npx cypress open
+
 up: ## Start the containers
 	CKAN_VERSION=$(CKAN_VERSION) docker-compose -f $(COMPOSE_FILE) up
 

README.md

@@ -40,7 +40,8 @@ This extension is compatible with these versions of CKAN.
 CKAN version | Compatibility
 ------------ | -------------
 <=2.8        | no
-2.9          | yes
+2.9          | 0.1.27 (last supported)
+2.10         | >=0.2.0
 
 
 ### Configuration
@@ -115,10 +116,10 @@ In order to support multiple versions of CKAN, or even upgrade to new versions
 of CKAN, we support development and testing through the `CKAN_VERSION`
 environment variable.
 
-    $ make CKAN_VERSION=2.9 test
+    $ make CKAN_VERSION=2.10 test
 
 
 Variable | Description | Default
 -------- | ----------- | -------
-CKAN_VERSION | Version of CKAN to use. | 2.9
+CKAN_VERSION | Version of CKAN to use. | 2.10
 COMPOSE_FILE | docker-compose service description file. | docker-compose.yml

ckanext/datagovtheme/blueprint.py

@@ -1,10 +1,8 @@
-from future import standard_library
-standard_library.install_aliases()
-
 import urllib.parse
 import ckan.plugins as p
 from ckan.plugins.toolkit import config
-from ckan.lib.base import c, request, abort
+from ckan.lib.base import abort
+from ckan.common import c, request
 
 from flask import Blueprint, redirect