Qgov master 2.11.2 cicd uplift etag#218
Open
duttonw wants to merge 22 commits intoqgov-master-2.11.4from
Open
Conversation
…24372 - Show 'displayed name' for cosmetic name field - Add more uploader functions to support plugins such as Archiver - Add '/dataset' fallback to URL generation - Convert dict values into strings before passing to Solr - Avoid changing package modified timestamp when reordering resources - Shorten the lock timeout on dropping datastore tables to avoid deadlocks
[QOLDEV-1087] update CKAN 2.11 fork base to 2.11.2 to patch CVE-2025-24372
…ail-addresses [QOLSVC-9300] clarify that admins can see your email address
- Sysadmins can see emails on the edit form anyway, might as well make it easier
…ail-addresses [QOLSVC-9300] allow sysadmins to view email addresses on profiles
* Merge all testing under one parent workflow * Pytest now runs and is split into 12 to run in under 3 mins (vs 10min for only 4 workers) * Allow dynamic splits to be passed in * Retieve and store latest pytest time stats for even splits * Allow individual workflows to still be callable (manually) * Allow pytest to run in single instance mode to generate test duration time data for improved splits * Uplift codeql-analysis workflow to v2
…least 3 times with 1 second dely
- Coveralls to Codecov * Coverage data submitted * Test units submited (pytest only at this time) - Html Reports available to download * PyTest Test Results * Coverage Report - Doc's generated via its own workflow (artifact has commit id in name)
❌ 3 Tests Failed:
View the top 3 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
ThrawnCA
requested changes
Apr 3, 2025
…e is never assigned in scope in helpers/jobs for now
./ckan/lib/helpers.py:2574:5: F824 `global _RESOURCE_FORMATS` is unused: name is never assigned in scope
global _RESOURCE_FORMATS
^
./ckan/lib/helpers.py:2723:5: F824 `global helper_functions` is unused: name is never assigned in scope
global helper_functions
^
./ckan/lib/jobs.py:105:5: F824 `global _queues` is unused: name is never assigned in scope
global _queues
^
3 F824 `global _RESOURCE_FORMATS` is unused: name is never assigned in scope
4639a66 to
0115317
Compare
Member
Author
|
This is 2 commits on top of #217 which has work already included in upstream master |
Qgov master 2.11.2 cicd uplift
Member
Author
|
backport from ckan upstream master: ckan#8781 |
new config: ckan.private_cache_expires: optional int ckan.cache_private_enabled: default True ckan.cache_etags: default True ckan.cache_etags_notModified: default True fix: ckan.cache_enabled now treated as bool instead of just set
…sponse not str for flask.send_file
0d0dc23 to
894cbf8
Compare
ThrawnCA
reviewed
Apr 10, 2025
|
|
||
| @pytest.mark.ckan_config("ckan.cache_expires", 3600) | ||
| def test_sets_cache_control_headers_with__no_private_cache__set(app: CKANTestApp): | ||
| """Test that cache control headers are set correctly when caching is allowed.""" |
There was a problem hiding this comment.
This comment is exactly the same as the previous test. It should say something more specific to this test.
new config: ckan.private_cache_expires: optional int ckan.cache_private_enabled: default True ckan.cache_etags: default True ckan.cache_etags_notModified: default True fix: ckan.cache_enabled now treated as bool instead of just set
|
@duttonw Can you uplift this to target 2.11.4? |
Member
Author
|
i'm going to need to redo this entire workload since upstream did not like the direction i took it :/ |
This file contains hidden or 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
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.
Fixes ckan#6955
Proposed fixes:
Introduce ETag response and ability to respond that data has not changed
Introduce ability to disable cache: private, and set no cache headers enforcement (in situations where Vary: Cookie fails)
Features:
Please [X] all the boxes above that apply