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.

Sign up for GitHub

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

Update config settings & Fix CI/CD #2

Merged
merged 15 commits into from
Dec 11, 2024
Merged

Update config settings & Fix CI/CD #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
88b9de1
Update config settings if they are not setup in the ini file
May 14, 2024
69eb811
Add Changelog message
Oct 29, 2024
a664cb2
Fix failing Github Actions
Oct 29, 2024
f57d75e
Pin setuptools==44.1.0
Oct 29, 2024
2d4257f
fix step for installing setuptools
Oct 29, 2024
2106d5d
Pin pip to 22.0.4
Oct 29, 2024
730fadb
try new docker tag
Oct 29, 2024
9d19be7
install curl
Nov 1, 2024
2f5b5bd
fix runs on
Nov 5, 2024
2ecf6be
Update README
Dec 10, 2024
9c1e804
change docker images
Dec 10, 2024
9edb774
fix indent
Dec 10, 2024
f30a977
change checkout version and install curl
Dec 10, 2024
fca9145
Change docker user to root instead of ckan for CI/CD
Dec 11, 2024
6e9f8d0
fix installing curl
Dec 11, 2024
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: 12 additions & 19 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,25 @@ 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-version: [2.9]
fail-fast: false
ckan-base-version: [2.9]
ckan-version: [py3.9]
solr-version: [solr8]
fail-fast: false

name: CKAN ${{ matrix.ckan-version }}
name: CKAN ${{ matrix.ckan-base-version }}
runs-on: ubuntu-latest
container:
image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
image: ckan/ckan-dev:${{ matrix.ckan-base-version }}-${{ matrix.ckan-version }}
options: --user root
services:
solr:
image: ckan/ckan-solr-dev:${{ matrix.ckan-version }}
image: ckan/ckan-solr:${{ matrix.ckan-base-version }}-${{ matrix.solr-version }}
postgres:
image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
image: ckan/ckan-postgres-dev:${{ matrix.ckan-base-version }}
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand All @@ -47,7 +38,9 @@ jobs:
CKAN_REDIS_URL: redis://redis:6379/1

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install CURL
run: apt install curl -y
- name: Install requirements
run: |
pip install -r dev-requirements.txt
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## 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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ckanext-berlindcatde_berlinath
# ckanext-berlindcatde

[![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 & Co. KG](https://www.berlinonline.net/).
This material is copyright © [BerlinOnline Stadtportal GmbH](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: 13 additions & 7 deletions ckanext/dcatde_berlin/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@ class Dcatde_BerlinPlugin(plugins.SingletonPlugin):
# Implementation IConfigurer
# -------------------------------------------------------------------

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}'
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}')

# -------------------------------------------------------------------
# Implementation IBlueprint
Expand Down
Loading