Merge pull request #35 from mjanez/dev

Update ckanext-schemingdcat, ckanext-spatial and ckanext-dcat
mjanez · Dec 12, 2024 · e6f6694 · e6f6694
2 parents bdfc315 + 4890264
commit e6f6694
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/playbook/inventories/development/host_vars/development_01.yml b/playbook/inventories/development/host_vars/development_01.yml
@@ -267,8 +267,8 @@ ckanext_versions:
   ckanext_xloader: 1.0.1-stable
   ckanext_harvest: v1.5.6
   ckanext_geoview: v0.2.2
-  ckanext_spatial: v2.1.1
-  ckanext_dcat: v1.8.0
+  ckanext_spatial: v2.2.0
+  ckanext_dcat: v2.1.0
   ckanext_scheming: release-3.0.0
   ckanext_resourcedictionary: v1.0.2
   ckanext_pages: v0.5.2
@@ -279,7 +279,7 @@ ckanext_versions:
 ### CKAN custom plugins #########################################
 # This is a dictionary of custom plugins to install. The key is the github user/repo and the value is the version to install.
 ckanext_custom_plugins:
-  mjanez/ckanext-schemingdcat: v4.2.3
+  mjanez/ckanext-schemingdcat: v4.3.0
   mjanez/ckanext-openapi: v1.0.0
 
 ### Solr Service #########################################

diff --git a/playbook/roles/ckan/tasks/ckan_install_ckan_exts.yml b/playbook/roles/ckan/tasks/ckan_install_ckan_exts.yml
@@ -68,44 +68,43 @@
   become: true
   become_user: "{{ ckan_user }}"
 
-- name: Install ckanext-spatial {{ ckanext_versions.ckanext_spatial }}
+- name: Install ckan/ckanext-spatial {{ ckanext_versions.ckanext_spatial }}
   vars:
     virtualenv: "{{ ckan_virtualenv }}"
   block:
-    - name: Install ckanext-spatial {{ ckanext_versions.ckanext_spatial }}
+    - name: Install ckan/ckanext-spatial {{ ckanext_versions.ckanext_spatial }}
       become: true
       become_user: "{{ ckan_user }}"
       pip:
-        name: git+https://github.com/mjanez/ckanext-spatial.git@{{ ckanext_versions.ckanext_spatial }}#egg=ckanext-spatial
+        name: git+https://github.com/ckan/ckanext-spatial.git@{{ ckanext_versions.ckanext_spatial }}#egg=ckanext-spatial
         virtualenv: "{{ ckan_virtualenv }}"
         extra_args: -e
       register: result
 
-    - name: Install ckanext-spatial requirements
+    - name: Install ckan/ckanext-spatial requirements
       become: true
       become_user: "{{ ckan_user }}"
       pip:
-        # Use a fixed version of requirements to avoid issues with Numpy 2.0
-        requirements: https://raw.githubusercontent.com/mjanez/ckan-docker/ckan-2.9.11/ckan/req_fixes/ckanext-spatial/requirements.txt
+        requirements: "{{ virtualenv }}/src/ckanext-spatial/requirements.txt"
         virtualenv: "{{ virtualenv }}"
       when: result is success
   become: true
   become_user: "{{ ckan_user }}"
 
-- name: Install mjanez/ckanext-dcat {{ ckanext_versions.ckanext_dcat }}
+- name: Install ckan/ckanext-dcat {{ ckanext_versions.ckanext_dcat }}
   vars:
     virtualenv: "{{ ckan_virtualenv }}"
   block:
-    - name: Install mjanez/ckanext-dcat {{ ckanext_versions.ckanext_dcat }}
+    - name: Install ckan/ckanext-dcat {{ ckanext_versions.ckanext_dcat }}
       become: true
       become_user: "{{ ckan_user }}"
       pip:
-        name: git+https://github.com/mjanez/ckanext-dcat.git@{{ ckanext_versions.ckanext_dcat }}#egg=ckanext-dcat
+        name: git+https://github.com/ckan/ckanext-dcat.git@{{ ckanext_versions.ckanext_dcat }}#egg=ckanext-dcat
         virtualenv: "{{ ckan_virtualenv }}"
         extra_args: -e
       register: result
 
-    - name: Install mjanez/ckanext-dcat requirements
+    - name: Install ckan/ckanext-dcat requirements
       become: true
       become_user: "{{ ckan_user }}"
       pip: