Backport for Upstream Patch to 2.10.8 #201
Merged
Conversation
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
(cherry picked from commit bb6a892)
[Backport dev-v2.10] fix: restrict pypi/test pypi deployments to repo ckan/ckan and no other
(cherry picked from commit 8fba084)
(cherry picked from commit a3d6751)
[Backport dev-v2.10] Fix lint and typing errors in master
(cherry picked from commit 63125b4)
(cherry picked from commit 45f9c30)
(cherry picked from commit 984e811)
(cherry picked from commit 652076d)
(cherry picked from commit ff1b9d7)
[Backport dev-v2.10] Add sysadmin check to has_user_permission_for_some_org
To avoid this error:
```
Collecting pysolr==3.9.0
Downloading pysolr-3.9.0.tar.gz (55 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 55.8/55.8 kB 10.9 MB/s eta 0:00:00
Preparing metadata (setup.py) ... error
error: subprocess-exited-with-error
× python setup.py egg_info did not run successfully.
│ exit code: 1
╰─> [68 lines of output]
/tmp/pip-install-pl2nz61h/pysolr_b1ed4c82cb7742cebd1d09257f8ff2a6/.eggs/setuptools_scm-8.2.0-py3.8.egg/setuptools_scm/_integration/setuptools.py:31: RuntimeWarning:
ERROR: setuptools==57.5.0 is used in combination with setuptools-scm>=8.x
Your build configuration is incomplete and previously worked by accident!
setuptools-scm requires setuptools>=61
Suggested workaround if applicable:
- migrating from the deprecated setup_requires mechanism to pep517/518
and using a pyproject.toml to declare build dependencies
which are reliably pre-installed before running the build tools
warnings.warn(
WARNING setuptools_scm.pyproject_reading toml section missing 'pyproject.toml does not contain a tool.setuptools_scm section'
Traceback (most recent call last):
File "/tmp/pip-install-pl2nz61h/pysolr_b1ed4c82cb7742cebd1d09257f8ff2a6/.eggs/setuptools_scm-8.2.0-py3.8.egg/setuptools_scm/_integration/pyproject_reading.py", line 36, in read_pyproject
section = defn.get("tool", {})[tool_name]
KeyError: 'setuptools_scm'
```
(cherry picked from commit f161718)
…f a `datetime` Currently in CKAN 2.10, `beaker.session.type=json` with `beaker.session.type=cookie` fails because the `last_active` attribute stored on the cookie is a `datetime` (and can't be serialized to JSON). This change addresses this by setting `session["last_active"]` as an iso string instead. (cherry picked from commit 40c1abd)
…v2.10 [ckan#8379] backport 2.10: Store `session["last_active"]` as an iso string instead of a …
This is a backport of ckan#8744 One difference is that we bumped pytest to latest 7.x minor version, not the latest 8.x one to keep compatibility
This is a backport of ckan#8783
(cherry picked from commit db71d37)
Manual backport of ckan@5347a0e
[Backport dev-v2.10] Catch error in datastore
Fix .btn-light on 2.10
(cherry picked from commit acf125c)
(cherry picked from commit 73e6ff6)
(cherry picked from commit 69b488c)
(cherry picked from commit 1ed7f4c)
(cherry picked from commit 98875f9)
# Conflicts: # .github/workflows/cypress.yml # .github/workflows/flake8.yml # .github/workflows/pyright.yml # ckan/logic/schema.py # ckan/public-bs3/base/javascript/client.js # ckan/templates-bs3/admin/config.html # ckan/templates-bs3/admin/index.html # ckan/templates-bs3/footer.html # ckan/templates-bs3/package/search.html # ckan/templates/snippets/search_form.html # ckanext/datatablesview/blueprint.py # test-core.ini ### RESOLVED.
- Added change log file. - Disabled github workflows.
wardi
approved these changes
Jun 6, 2025
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.
Going from 2.10.7 -> 2.10.8