new build of css resource and sync with upstream main branch

FlavorFlav · Feb 5, 2022 · f7db7cc · f7db7cc
2 parents de2ffa7 + 8723840
commit f7db7cc
Show file tree

Hide file tree

Showing 118 changed files with 6,336 additions and 900 deletions.
diff --git a/.flake8 b/.flake8
@@ -16,7 +16,6 @@ extend-exclude =
                ckan/lib/email_notifications.py
                ckan/lib/hash.py
                ckan/lib/jinja_extensions.py
-               ckan/lib/jsonp.py
                ckan/lib/maintain.py
                ckan/lib/navl/validators.py
                ckan/lib/plugins.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,6 +9,41 @@ Changelog
 
 .. towncrier release notes start
 
+v.2.9.5 2022-01-19
+==================
+
+
+Major features
+--------------
+
+- Solr 8 support. Starting from version 2.9.5, CKAN supports Solr versions 6 and 8. Support for Solr 6 will be dropped in the next
+  CKAN minor version (2.10). Note that if you want to use Solr 8 you need to use the ``ckan/config/solr/schema.solr8.xml`` file, or
+  alternatively you can use the ``ckan/ckan-solr:2.9-solr8`` Docker image which comes pre-configured. (`#6530 <https://github.com/ckan/ckan/pull/6530>`_)
+
+
+Bugfixes
+--------
+
+- Consistent CLI behavior when no command is provided and when using `--help` (`#6120 <https://github.com/ckan/ckan/pull/6120>`_)
+- Fix regression when validating resource subfields (`#6546 <https://github.com/ckan/ckan/pull/6546>`_)
+- Fix user create/edit email validators (`#6399 <https://github.com/ckan/ckan/pull/6399>`_)
+- Error opening JS translations on Python 2 (`#6531 <https://github.com/ckan/ckan/pull/6531>`_)
+- Set logging level to error in error mail handler (`#6577 <https://github.com/ckan/ckan/pull/6577>`_)
+- Add RootPathMiddleware to flask stack to support non-root installs running on python 3 (`#6556 <https://github.com/ckan/ckan/pull/6577>`_)
+- Use correct auth function when editing organizations (`#6622 <https://github.com/ckan/ckan/pull/6622>`_)
+- Fix invite user with existing email error (`#5880 <https://github.com/ckan/ckan/pull/5880>`_)
+- Accept empty string in one of validator (`#6612 <https://github.com/ckan/ckan/pull/6612>`_)
+
+
+Minor changes
+-------------
+
+- Add timeouts to requests calls (see :ref:`ckan.requests.timeout`) (`#6408 <https://github.com/ckan/ckan/pull/6408>`_)
+- Types of file uploads for group and user imags can be restricted via the `ckan.upload.{object_type}.types` and `ckan.upload.{object_type}.mimetypes`  config options (eg :ref:`ckan.upload.group.types`,  :ref:`ckan.upload.user.mimetypes`) (`#6477 <https://github.com/ckan/ckan/pull/6477>`_)
+- Allow children elements on select2 lists (`#6503 <https://github.com/ckan/ckan/pull/6503>`_)
+- Enable ``minimumInputLength`` and fix loading message in select2 (`#6554 <https://github.com/ckan/ckan/pull/6554>`_)
+
+
 v.2.9.4 2021-09-22
 ==================
 
@@ -482,6 +517,17 @@ Removals and deprecations
   (`#5112 <https://github.com/ckan/ckan/pull/5112>`_)
 - Remove paster CLI (`#5264 <https://github.com/ckan/ckan/pull/5264>`_)
 
+v.2.8.10 2022-01-19
+===================
+
+Fixes:
+
+* Add timeouts to requests calls (see :ref:`ckan.requests.timeout`) (`#6408 <https://github.com/ckan/ckan/pull/6408>`_)
+* Fix user create/edit email validators (`#6399 <https://github.com/ckan/ckan/pull/6399>`_)
+* Allow children elements on select2 lists (`#6503 <https://github.com/ckan/ckan/pull/6503>`_)
+
+
+
 v.2.8.9 2021-09-22
 ==================
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # See CKAN docs on installation from Docker Compose on usage
-FROM ubuntu:focal-20210119
+FROM ubuntu:focal
 MAINTAINER Open Knowledge
 
 # Set timezone

diff --git a/changes/6226.feature b/changes/6226.feature
@@ -0,0 +1 @@
+Add extensible snippet for resource uploads
diff --git a/changes/6639.removal b/changes/6639.removal
@@ -0,0 +1 @@
+Remove ckan.search.automatic_indexing config
diff --git a/changes/6648.removal b/changes/6648.removal
@@ -0,0 +1,2 @@
+The `PluginMapperExtension` has been removed since it was no longer used in core
+and it had a deprecated dependency.
diff --git a/ckan/config/config_declaration.yaml b/ckan/config/config_declaration.yaml
@@ -240,6 +240,9 @@ groups:
           - http
           - https
           - ftp
+      - key: ckan.requests.timeout
+        default: 5
+        type: int
 
   - annotation: Authorization Settings
     options:
@@ -305,9 +308,6 @@ groups:
         required: true
       - key: solr_user
       - key: solr_password
-      - key: ckan.search.automatic_indexing
-        type: bool
-        default: true
       - key: ckan.search.solr_commit
         type: bool
         default: true
@@ -377,6 +377,9 @@ groups:
           Note: Add ``datastore`` to enable the CKAN DataStore.
           Add ``datapusher`` to enable DataPusher.
           Add ``resource_proxy`` to enable resorce proxying and get around the same origin policy.
+      - key: ckan.resource_proxy.timeout
+        type: int
+        default: 5
 
   - annotation: Front-End Settings
     options:
@@ -391,9 +394,6 @@ groups:
         default: /base/css/main.css
       - key: ckan.favicon
         default: /base/images/ckan.ico
-      - key: ckan.legacy_templates
-        ignored: true
-        type: bool
       - key: ckan.datasets_per_page
         type: int
         default: 20

diff --git a/ckan/config/declaration/load.py b/ckan/config/declaration/load.py
@@ -83,9 +83,7 @@ def load_dict(declaration: "Declaration", definition: DeclarationDict):
     if version == 1:
 
         data, errors = validate(definition, config_declaration_v1())
-        if any(
-            options for item in errors["groups"] for options in item["options"]
-        ):
+        if errors:
             raise ValidationError(errors)
         for group in data["groups"]:
             if group["annotation"]:

diff --git a/ckan/config/environment.py b/ckan/config/environment.py
@@ -227,6 +227,9 @@ def update_config():
     except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.OperationalError):
         # The database is not yet initialised. It happens in `ckan db init`
         pass
+    except sqlalchemy.exc.IntegrityError:
+        # Race condition, user already exists.
+        pass
 
     # Close current session and open database connections to ensure a clean
     # clean environment even if an error occurs later on

diff --git a/ckan/i18n/am/LC_MESSAGES/ckan.po b/ckan/i18n/am/LC_MESSAGES/ckan.po
@@ -3547,9 +3547,9 @@ msgid ""
 "documentation</a>."
 msgstr ""
 "የመረጃ ማከማቻ የውጫዊ ቅጥያ ከሌለ የውሂብ አሳሽ እይታዎች ፈጣን እና አስተማማኝ ላይሆኑ ይችላሉ። ለተጨማሪ መረጃ "
-"እባክዎ <a href='http://docs.ckan.org/en/latest/maintaining/data-viewer.html"
-"#viewing-structured-data-the-data-explorer' target='_blank'> የመረጃ አሳሽ</a> "
-"ሰነዶችን ይመልከቱ። "
+"እባክዎ <a href='http://docs.ckan.org/en/latest/maintaining/data-"
+"viewer.html#viewing-structured-data-the-data-explorer' target='_blank'> የመረጃ"
+" አሳሽ</a> ሰነዶችን ይመልከቱ። "
 
 #: ckan/templates/package/new_view.html:29
 #: ckan/templates/package/snippets/resource_form.html:85
@@ -4555,8 +4555,8 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:22
@@ -4565,9 +4565,9 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_extras.html:5

diff --git a/ckan/i18n/ar/LC_MESSAGES/ckan.po b/ckan/i18n/ar/LC_MESSAGES/ckan.po
@@ -4681,8 +4681,8 @@ msgstr "غيّر خاصية ظهور {pkg_link} إلى {visibility}"
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 "حدث وصف المورد {resource_link} في {pkg_link}\n"
 "          إلى <br class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
@@ -4695,9 +4695,9 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 "تم تحديث وصف المورد {resource_link} في {pkg_link}\n"
 "          من <br class=\"line-height2\"><blockquote>{old_desc}</blockquote>\n"
@@ -5252,9 +5252,9 @@ msgid ""
 "API Token created: <code style=\"word-break:break-all;\">{token}</code> "
 "{copy}<br>Make sure to copy it now, you won't be able to see it again!"
 msgstr ""
-"تم إنشاء رمز الأمان للواجهة البرمجية (API token). <code style=\"word-break"
-":break-all;\">{token}</code> {copy}<br>تأكد من نسخه حيث لن تستطيع مشاهدته "
-"لاحقا!"
+"تم إنشاء رمز الأمان للواجهة البرمجية (API token). <code style=\"word-"
+"break:break-all;\">{token}</code> {copy}<br>تأكد من نسخه حيث لن تستطيع "
+"مشاهدته لاحقا!"
 
 #: ckan/views/user.py:234
 msgid "Unauthorized to revoke API tokens."

diff --git a/ckan/i18n/bg/LC_MESSAGES/ckan.po b/ckan/i18n/bg/LC_MESSAGES/ckan.po
@@ -4570,8 +4570,8 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:22
@@ -4580,9 +4580,9 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_extras.html:5

diff --git a/ckan/i18n/ca/LC_MESSAGES/ckan.po b/ckan/i18n/ca/LC_MESSAGES/ckan.po
@@ -3632,9 +3632,9 @@ msgid ""
 msgstr ""
 "L'explorador de dades pot ser lent i poc fiable si la extensió de la "
 "DataStore no està habilitada. Per a més informació, si us plau consulteu la "
-"<a href='http://docs.ckan.org/en/latest/maintaining/data-viewer.html"
-"#viewing-structured-data-the-data-explorer' target='_blank'>documentació de "
-"l'explorador de dades</a>. "
+"<a href='http://docs.ckan.org/en/latest/maintaining/data-"
+"viewer.html#viewing-structured-data-the-data-explorer' "
+"target='_blank'>documentació de l'explorador de dades</a>. "
 
 #: ckan/templates/package/new_view.html:29
 #: ckan/templates/package/snippets/resource_form.html:85
@@ -4658,8 +4658,8 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:22
@@ -4668,9 +4668,9 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_extras.html:5

diff --git a/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po b/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
@@ -4679,8 +4679,8 @@ msgstr "Nastavit viditelnost {pkg_link} na {visibility}"
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 "Aktualizován popis zdroje {resource_link} v {pkg_link} na <br class=\"line-"
 "height2\"><blockquote>{new_desc}</blockquote>"
@@ -4691,9 +4691,9 @@ msgstr "Odebrán popis ze zdroje {resource_link} v {pkg_link}"
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 "Aktualizován popis zdroje {resource_link} v {pkg_link} z <br class=\"line-"
 "height2\"><blockquote>{old_desc}</blockquote> na <br class=\"line-"

diff --git a/ckan/i18n/da_DK/LC_MESSAGES/ckan.po b/ckan/i18n/da_DK/LC_MESSAGES/ckan.po
@@ -4543,8 +4543,8 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:5
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} to <br class"
-"=\"line-height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:22
@@ -4553,9 +4553,9 @@ msgstr ""
 
 #: ckan/templates/snippets/changes/resource_desc.html:38
 msgid ""
-"Updated description of resource {resource_link} in {pkg_link} from <br class"
-"=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br class=\"line-"
-"height2\"><blockquote>{new_desc}</blockquote>"
+"Updated description of resource {resource_link} in {pkg_link} from <br "
+"class=\"line-height2\"><blockquote>{old_desc}</blockquote> to <br "
+"class=\"line-height2\"><blockquote>{new_desc}</blockquote>"
 msgstr ""
 
 #: ckan/templates/snippets/changes/resource_extras.html:5

diff --git a/ckan/i18n/de/LC_MESSAGES/ckan.mo b/ckan/i18n/de/LC_MESSAGES/ckan.mo
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The `PluginMapperExtension` has been removed since it was no longer used in core
		and it had a deprecated dependency.