Merge dockerizing into main branch #102
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We are using ckanext-envvars for config now, and env var names cannot contain hyphens.
Previously, when creating a resource with url_type 'upload', we added the filename of the resource file as the resource url. This was presumably so that when the file was uploaded by ckan/ckan/lib/uploader.py:ResourceUpload, the uploader could use the file extension to guess the mimetype of the file. We used a custom validator in ckanext-stadtzh-theme that would not validate resource urls if resource url_type was 'upload'. However, the ResourceUpload class has now been changed to validate the url before using it to guess the mimetype, so this no longer works. If we don't enter a url here, the uploader will instead use the file extension of the uploaded file to guess the mimetype. It also overwrites the resource url with the url of the uploaded file, so there is really no reason to keep setting the url here.
Update for CKAN 2.9
This will be overwritten if there is a description in the metadata for this resource.
This test not only fails with the error, 'Validator validate_url not found' but causes all tests run after it to fail in the same way. Figure this out in the future.
Necessary for ckan 2.9 compatibility.
Also, re-enable test that was failing because the theme plugin was not enabled.
For Python 3 compatibility.
Fix tests for CKAN 2.9
This is so it can be used by ckanext-stadtzh_losdharvest as well.
The solr/ directory is copied from our base repository. It will have to be updated when we make updates there - we should change this to have less duplication.
Because otherwise docker complains.
We need to use the ckan-2.10-python-3 branch so that CKAN 2.10 tests will pass for this repo.
This reverts commit 2109542.
Feature/ckan 2.10 python 3
This is important so that we don't create all our custom tags (in the 'with_plugins' fixture) and then delete them again (in 'clean_db').
If we get an alembic error, we are using a version of ckanext-harvest before they switched to alembic migrations.
We need the harvest plugin loaded first so that we can run any necessary db migrations for it after the db is cleaned. We need the stadtzhtheme plugin loaded afterwards, so that we can create all our tag vocabularies (which would be removed on cleaning the db).
tests: Fix harvester tests
stefina
approved these changes
Feb 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.