Revert "Update config settings & Fix CI/CD (#2)" (#3)

This reverts commit 54a8120.
berlinonline · Dec 11, 2024 · e5655d2 · e5655d2
1 parent 54a8120
commit e5655d2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,25 +4,34 @@ on:
     branches:
       - '**'
 jobs:
+  # lint:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-python@v2
+  #       with:
+  #         python-version: '3.6'
+  #     - name: Install requirements
+  #       run: pip install flake8 pycodestyle
+  #     - name: Check syntax
+  #       run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics --exclude ckan
+
   test:
     # needs: lint
     strategy:
       matrix:
-        ckan-base-version: [2.9]
-        ckan-version: [py3.9]
-        solr-version: [solr8]
-      fail-fast: false  
+        ckan-version: [2.9]
+      fail-fast: false
 
-    name: CKAN ${{ matrix.ckan-base-version }}
+    name: CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     container:
-      image: ckan/ckan-dev:${{ matrix.ckan-base-version }}-${{ matrix.ckan-version }}
-      options: --user root
+      image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
     services:
       solr:
-        image: ckan/ckan-solr:${{ matrix.ckan-base-version }}-${{ matrix.solr-version }}
+        image: ckan/ckan-solr-dev:${{ matrix.ckan-version }}
       postgres:
-        image: ckan/ckan-postgres-dev:${{ matrix.ckan-base-version }}
+        image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -38,9 +47,7 @@ jobs:
       CKAN_REDIS_URL: redis://redis:6379/1
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Install CURL
-      run: apt install curl -y
+    - uses: actions/checkout@v2
     - name: Install requirements
       run: |
         pip install -r dev-requirements.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,6 @@
 
 ## Development
 
-- Update config settings (read from .ini file or use default value if the variable is not set)
-
 ## [0.3.4](https://github.com/berlinonline/ckanext-dcatde_berlin/releases/tag/0.3.4)
 
 _(2023-05-19)_

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ckanext-berlindcatde
+# ckanext-berlindcatde_berlinath
 
 [![Tests](https://github.com/berlinonline/ckanext-dcatde_berlin/workflows/Tests/badge.svg?branch=master)](https://github.com/berlinonline/ckanext-dcatde_berlin/actions)
 [![Code Coverage](http://codecov.io/github/berlinonline/ckanext-dcatde_berlin/coverage.svg?branch=master)](http://codecov.io/github/berlinonline/ckanext-dcatde_berlin?branch=master)
@@ -20,7 +20,7 @@ This plugin has been tested with CKAN 2.9.5 (which requires Python 3).
 
 ## License
 
-This material is copyright © [BerlinOnline Stadtportal GmbH](https://www.berlinonline.net/).
+This material is copyright © [BerlinOnline Stadtportal GmbH & Co. KG](https://www.berlinonline.net/).
 
 This extension is open and licensed under the GNU Affero General Public License (AGPL) v3.0.
 Its full text may be found at:

diff --git a/ckanext/dcatde_berlin/plugin.py b/ckanext/dcatde_berlin/plugin.py
@@ -15,19 +15,13 @@ class Dcatde_BerlinPlugin(plugins.SingletonPlugin):
     # Implementation IConfigurer
     # -------------------------------------------------------------------
 
-    def update_config(self, config):
-        config['ckanext.dcat.enable_content_negotiation'] = config.get(
-        'ckanext.dcat.enable_content_negotiation', True)
-        config['ckanext.dcat.rdf.profiles'] = config.get(
-        'ckanext.dcat.rdf.profiles', 'euro_dcat_ap dcatap_de')
-        config['ckanext.dcatde.contributorid'] = config.get(
-        'ckanext.dcatde.contributorid','berlinOpenData')
-        config['ckanext.dcatde.version'] = config.get(
-        'ckanext.dcatde.version', '1.0.1')
-        config['ckanext.dcatde_berlin.formats'] = config.get(
-        'ckanext.dcatde_berlin.formats', 'ttl xml jsonld rdf')
-        config['ckanext.dcatde_berlin.additional_endpoints'] = config.get(
-        'ckanext.dcatde_berlin.additional_endpoints', f'/{no_fisbroker_blueprint.CATALOG_ENDPOINT_PATH}')
+    def update_config(self, config):  
+        config['ckanext.dcat.enable_content_negotiation'] = True
+        config['ckanext.dcat.rdf.profiles'] = 'euro_dcat_ap dcatap_de'
+        config['ckanext.dcatde.contributorid'] = 'berlinOpenData'
+        config['ckanext.dcatde.version'] = '1.0.1'
+        config['ckanext.dcatde_berlin.formats'] = 'ttl xml jsonld'
+        config['ckanext.dcatde_berlin.additional_endpoints'] = f'/{no_fisbroker_blueprint.CATALOG_ENDPOINT_PATH}'
 
     # -------------------------------------------------------------------
     # Implementation IBlueprint