[ckan-changes] [ckan/ckan] f9775a: [#4801] Configure Flask app to serve public folders

Wed Dec 25 11:38:41 UTC 2019

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: f9775a186465cecc9bf0f8cae47313dfbf913967
      https://github.com/ckan/ckan/commit/f9775a186465cecc9bf0f8cae47313dfbf913967
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit.py.orig
    M requirements-py2.in
    M requirements-py2.txt
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#4801] Configure Flask app to serve public folders

Credit to @smotornyuk

This adds the Flask MultiStatic plugin to be able to add static assets
form extensions.

  Commit: 6916b7a3cf209daf2fb2fd62baf36bddf0f56e4c
      https://github.com/ckan/ckan/commit/6916b7a3cf209daf2fb2fd62baf36bddf0f56e4c
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/lib/repoze_plugins/friendly_form.py

  Log Message:
  -----------
  [#4801] Fix multidict handling in friendly form plugin

  Commit: 01481d973721a9818b387d349b5f124abd536c0a
      https://github.com/ckan/ckan/commit/01481d973721a9818b387d349b5f124abd536c0a
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/controllers/error.py
    M ckan/templates/error_document_template.html

  Log Message:
  -----------
  [#4801] Align format of flask exceptions with Pylons/webob ones

  Commit: 5c9e38bdabc8cdca8d8f31a79390601ef2077bd3
      https://github.com/ckan/ckan/commit/5c9e38bdabc8cdca8d8f31a79390601ef2077bd3
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    R ckan/tests/legacy/functional/api/test_util.py
    R ckan/tests/legacy/functional/test_error.py

  Log Message:
  -----------
  [#4801] Remove no longer relevant legacy tests

These were not testing what was intended, and were masked by the
catch-all template controller

  Commit: 8ee21484d3ceb6c0f0d9eb8d239a3a97baf2e5ac
      https://github.com/ckan/ckan/commit/8ee21484d3ceb6c0f0d9eb8d239a3a97baf2e5ac
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/config/routing.py
    A ckan/public/robots.txt
    R ckan/templates/robots.txt

  Log Message:
  -----------
  [#4801] Serve robots.txt from the public folder (not templates)

  Commit: e4d523e06bfbe6cfd17957671f2b995e7d9d2a40
      https://github.com/ckan/ckan/commit/e4d523e06bfbe6cfd17957671f2b995e7d9d2a40
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/tests/test_none_root.py
    M ckanext/example_theme_docs/custom_config_setting/plugin.py
    M ckanext/example_theme_docs/v12_extra_public_dir/plugin.py
    M ckanext/example_theme_docs/v15_fanstatic/plugin.py
    M ckanext/example_theme_docs/v22_fanstatic_and_webassets/plugin.py

  Log Message:
  -----------
  [#4801] Update non-root test using weird URL and fix related bug in example theme plugin

  Commit: edeb59e2002640365d05d24b2fcaae47f614f2ad
      https://github.com/ckan/ckan/commit/edeb59e2002640365d05d24b2fcaae47f614f2ad
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/template.py
    M ckan/tests/config/test_middleware.py
    R ckan/tests/controllers/test_template.py

  Log Message:
  -----------
  [#4801] Remove catch-all template controller

Pylons used to have a catch-all route defined that tried to look for the
path in the provided URL in the templates folder. With changed in the
multiple static folders introduced in f9775a1 this route is never
reached, as we now set the catch-all route to look for the path in the
public folder(s) (which makes more sense to be honest).

Modified the middleware tests to reflect this.

  Commit: fe2e6ea3d085b8ee8096dc33d42b679e94b50aa6
      https://github.com/ckan/ckan/commit/fe2e6ea3d085b8ee8096dc33d42b679e94b50aa6
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Consolidate PY2 var name

  Commit: 4e015d93a56a7fd95a5daa6ad2b60038e9f1558e
      https://github.com/ckan/ckan/commit/4e015d93a56a7fd95a5daa6ad2b60038e9f1558e
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/cli/__init__.py
    M ckan/tests/pytest_ckan/ckan_setup.py

  Log Message:
  -----------
  [#4801] Use load_config from new CLI, support expanding user name

  Commit: 7935b5477cdd3fd4b0e73ca146448068705a8606
      https://github.com/ckan/ckan/commit/7935b5477cdd3fd4b0e73ca146448068705a8606
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/common.py

  Log Message:
  -----------
  [#4801] Default to Flask's uggettext (_) in all cases

  Commit: 5f7d60fc98f42f833af439ea70b64dd0c0952b5c
      https://github.com/ckan/ckan/commit/5f7d60fc98f42f833af439ea70b64dd0c0952b5c
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/pytest_ckan/ckan_setup.py

  Log Message:
  -----------
  [#4801] Properly initialize environment in pytest

I wrobgly assumed that the `load_config` method on the new cli did the
same as the one in the old, but it just parses the config file.
Added a call to `make_app` (which calls `load_environment`) to be able
to generate a test request context in order to be able to generate URLs
outside the context of an actual web request.

  Commit: f72da33e71d9b4972875a08981dbcd2eabd6bfec
      https://github.com/ckan/ckan/commit/f72da33e71d9b4972875a08981dbcd2eabd6bfec
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [#4801] Refactor augment_data so it does not change dicts on loops

  Commit: 8cce17b00dda4011f82f659e6398a21a8e8a9cfa
      https://github.com/ckan/ckan/commit/8cce17b00dda4011f82f659e6398a21a8e8a9cfa
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/cli/__init__.py

  Log Message:
  -----------
  Coding standards

  Commit: c2ba9410a76b5b068c22d03f17a2d46a8643ba9b
      https://github.com/ckan/ckan/commit/c2ba9410a76b5b068c22d03f17a2d46a8643ba9b
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#4801] Remove deprecated helper function

  Commit: 8c913e2be1e2a6014337cd1dde2a6b59b8c1353b
      https://github.com/ckan/ckan/commit/8c913e2be1e2a6014337cd1dde2a6b59b8c1353b
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#4801] Don't use pylons to get language outside a request

  Commit: 1167dac9b3c81c907ad8e0da926496f56e3583fb
      https://github.com/ckan/ckan/commit/1167dac9b3c81c907ad8e0da926496f56e3583fb
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/authz.py
    M ckan/common.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/model/resource.py
    M ckan/views/group.py
    M ckanext/datastore/backend/postgres.py

  Log Message:
  -----------
  [#4801] Consolidate usage of OrderedDict

Always import from collections. Remove from ckan.common

  Commit: a44af3ef9aa2762b4b130d2afbb67ff5146c106d
      https://github.com/ckan/ckan/commit/a44af3ef9aa2762b4b130d2afbb67ff5146c106d
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/cli/sysadmin.py
    M ckan/views/dataset.py
    M ckan/views/group.py

  Log Message:
  -----------
  [#4801] OrderedDict.keys() returns an odict_keys object in py3

  Commit: cb9b03ee921b8a1f9dcb46241ca925b739d6d4cb
      https://github.com/ckan/ckan/commit/cb9b03ee921b8a1f9dcb46241ca925b739d6d4cb
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/pagination.py

  Log Message:
  -----------
  [#4801] Use ints in paginator

Otherwise we get the following in py3:

TypeError: 'float' object cannot be interpreted as an integer

  Commit: fe2c5e154915bfe500d03564fc878853881123f1
      https://github.com/ckan/ckan/commit/fe2c5e154915bfe500d03564fc878853881123f1
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/cli/sysadmin.py
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Pep 8

  Commit: 3a8f00e4f59f95186f956579952d7b8633cce594
      https://github.com/ckan/ckan/commit/3a8f00e4f59f95186f956579952d7b8633cce594
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#4801] Do not fall back to Pylons on url_for on py3

  Commit: a35902f1af876ad2e825a990f13d2e857b2eaec7
      https://github.com/ckan/ckan/commit/a35902f1af876ad2e825a990f13d2e857b2eaec7
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M ckan/templates/snippets/follow_button.html

  Log Message:
  -----------
  [#4801] Don't use controller based routes on url_for

  Commit: a3cbca96505aae0398534e02da7ed9ac60b03a72
      https://github.com/ckan/ckan/commit/a3cbca96505aae0398534e02da7ed9ac60b03a72
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2019-12-25 (Wed, 25 Dec 2019)

  Changed paths:
    M ckan/authz.py
    M ckan/cli/__init__.py
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/error.py
    R ckan/controllers/template.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/pagination.py
    M ckan/lib/repoze_plugins/friendly_form.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/model/resource.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit.py.orig
    A ckan/public/robots.txt
    M ckan/templates/error_document_template.html
    R ckan/templates/robots.txt
    M ckan/templates/snippets/follow_button.html
    M ckan/tests/config/test_middleware.py
    R ckan/tests/controllers/test_template.py
    R ckan/tests/legacy/functional/api/test_util.py
    R ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/pytest_ckan/ckan_setup.py
    M ckan/tests/test_none_root.py
    M ckan/views/dataset.py
    M ckan/views/group.py
    M ckanext/datastore/backend/postgres.py
    M ckanext/example_theme_docs/custom_config_setting/plugin.py
    M ckanext/example_theme_docs/v12_extra_public_dir/plugin.py
    M ckanext/example_theme_docs/v15_fanstatic/plugin.py
    M ckanext/example_theme_docs/v22_fanstatic_and_webassets/plugin.py
    M requirements-py2.in
    M requirements-py2.txt
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #5130 from ckan/py3-general-support-3

[#4801] PY3 General Support - Part 3

Compare: https://github.com/ckan/ckan/compare/f4cfe5e28789...a3cbca96505a