Skip to content

Commit 964a6be

Browse files
authored
Merge branch 'master' into add-toast-js-module
2 parents ac81927 + cfe9605 commit 964a6be

File tree

554 files changed

+12235
-20334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+12235
-20334
lines changed

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
CKAN_POSTGRES_PWD: pass
143143
PGPASSWORD: ckan
144144

145-
PYTEST_COMMON_OPTIONS: -v --ckan-ini=test-core-ci.ini --cov=ckan --cov=ckanext --cov-branch --cov-report=term-missing --junitxml=./junit/result/junit-${{ matrix.split }}.xml -o junit_family=legacy
145+
PYTEST_COMMON_OPTIONS: -v --ckan-ini=test-core-ci.ini --cov=ckan --cov=ckanext --cov-branch --cov-report=term-missing --junitxml=./junit/result/junit-${{ matrix.split }}.xml -o junit_family=legacy --log-disable=ckan
146146

147147

148148
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ node_modules/
3939
# cypress
4040
cypress.env.json
4141
cypress/videos
42+
cypress/screenshots
4243

4344
#testing
4445
junit

.snyk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities
2+
version: v1.25.0
3+
language-settings:
4+
python: "3.10"

CHANGELOG.rst

Lines changed: 170 additions & 51 deletions

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ include ckanext/datastore/set_permissions.sql
2424
include ckanext/datastore/allowed_functions.txt
2525

2626
prune .git
27-
include CHANGELOG.txt
27+
include CHANGELOG.rst
2828
include ckan/migration/README
2929
include requirements.txt
3030
include dev-requirements.txt

changes/8200.feature

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Implement interface INotifier to allow extensions to send custom notifications.
2+
Skip CKAN email sending if smtp server is not defined.

changes/8293.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added `IMailer` implement to framework the `mailer.py` script.

changes/8340.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Datastore dump XML format now conforms field names to XML element name conventions.

changes/8342.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Datastore field names/IDs are now validated at the schema level. Control characters are no longer allowed in Datastore field names/IDs.

changes/8684.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
`datastore_create`, `datastore_upsert`, and `datastore_delete` now accepts `include_records` to return inserted/deleted records in the return dict, this defaults to False and `datastore_upsert` no longer includes `records` in the return dict by default. `datastore_create`, `datastore_upsert`, and `datastore_delete` with `"include_records": True` will now include the actual data inserted/updated in the return dict's `records` (`deleted_records` for `datastore_delete`). The returned records now include the `_id` column and all field values after processing by any database triggers. Formerly the records returned were only a copy of the values passed by the caller.

0 commit comments

Comments
 (0)