dev into prod #6519
Merged
dev into prod #6519
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
`urlparse` got more strict with the values it considers valid so this "URL" used in our tests is no longer correctly parsed: 'sh+eme://[net:loc]:12345/a/path?a=b&c=d' This should help turn some of the versions green here: https://github.com/ckan/ckan-python-monitor For reference: python/cpython#103848
[#8201] Fix misplaced CSRF token in the BS3 collaborator_new.html
- Give default values to `od_conformance` and `osd_conformance`. (cherry picked from commit ab272627e597dad2aec348f21eada4ec85d759cc)
- Added change log file. (cherry picked from commit ba847666a1c5e498bf3dec51eeb35b1c75cf4a6e)
For instance when using a custom schema without this field. Also use the `h.localise_filesize()` helper instead of the more convoluted `h.SI_number_span(res.size)|striptags` (cherry picked from commit 3a50fc154ab9326ddb0d8f46c4e763de7e7c79b2)
(cherry picked from commit d154cfedddef3b3fdb7e1c71338c0822b4e1ae08)
(cherry picked from commit d7b14ade0ccf34dd43dd3c983da4675428829baa)
Upgraded certifi, Jinja2, requests, urllib3 and sqlparse
- adapting the Dockerfile so that the new version will appear in the image - adapting documentation. Also removing references to Python 2
- manually updating dependencies in dev-requirements.in - updating dependecies in requirements.txt and dev-requirements.txt via pip-tools (pip-compile)
# Conflicts: # ckanext-hdx_theme/ckanext/hdx_theme/version.py
HDX-10496 For newly created datasets the archive flag is not set by d…
# Conflicts: # ckanext-hdx_theme/ckanext/hdx_theme/version.py
…a-panel HDX-10171 remove metadata tab & add additional info panel
# Conflicts: # ckanext-hdx_theme/ckanext/hdx_theme/version.py
…a-panel HDX-10171 replace char & remove space before punctuation
PR HDX-10221 Using pcode version 2.1.0
…a-panel HDX-10171 small fixes for qa dashboard
HDX-10460 add pcode label
HDX-10460 remove pcode icon from resources
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.