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

Feat/update to ckan 2.10 python 3 #3

Merged
merged 320 commits into from
Feb 28, 2024
Merged

Conversation

bellisk
Copy link
Contributor

@bellisk bellisk commented Aug 3, 2023

No description provided.

@bellisk bellisk force-pushed the feat/update-to-ckan-2.10-python-3 branch 2 times, most recently from 8b4b184 to 31c3aec Compare August 7, 2023 13:13
@bellisk bellisk marked this pull request as ready for review August 8, 2023 09:15
bellisk added 26 commits August 23, 2023 17:22
These templates were only overridden to use the bs3-confirm-action.js module, which has now been removed.
These templates were only overridden to use the bs3-confirm-action.js module, which has now been removed.
bs3-image-upload.js replicates the current image-upload.js module less nice functionality and is unnecessary now.
This macro was only overridden to use the bs3-image-upload.js module, which has now been removed.
bs3-resource-reorder.js replicates the current resource-reorder.js module less nice functionality and is unnecessary now.
This template was only overridden to use the bs3-confirm-action.js module, which has now been removed.
This wasn't being loaded correctly and the CKAN vendor bootstrap.js  was causing no problems, so out it goes.
Our changes to these templates are obsolete with CKAN 2.10
values.values() now has the type dict_values and needs to be cast to a list before being JSON-serialized.
The class 'dataset-form' is required so that our CSS can correctly style the form inputs.
I don't know why *removing* the backwards compatibility here works, but it does.
bellisk and others added 28 commits January 25, 2024 13:15
This should prevent installation failure caused by the fact that the version of black we use requires a higher version of packaging than is installed on the test docker container.

In that case, pip tries to uninstall packaging before installing our dev-requirements (including black), but the uninstallation fails because packaging was not originally installed by pip.
We need to keep backwards compatibility (which we previously removed) so that uploading files works when using ckanext-scheming.
fix: Remove override of resource upload template
…rch-results

Fix/fall back to dataset name in search results
This block can be removed from our template when ckan/ckan#8048 is merged and in use.
…-plugin

Feat/remove references to hrf faq wp plugin
This does not affect the tests on github as we ensure the test-core.ini location is set correctly before running tests there.
@bellisk bellisk merged commit 82d9448 into main Feb 28, 2024
4 checks passed
@bellisk bellisk deleted the feat/update-to-ckan-2.10-python-3 branch February 28, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants