Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)_
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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:
Expand Down
20 changes: 7 additions & 13 deletions ckanext/dcatde_berlin/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading