[ckan-changes] [ckan/ckan] c38b78: [#2972] Overwrite path to solr core for Travis

Thu May 26 11:58:44 UTC 2016

  Branch: refs/heads/poc-flask-views
  Home:   https://github.com/ckan/ckan
  Commit: c38b78ddfa000bb4b5ae92b31193ca19acaa9d17
      https://github.com/ckan/ckan/commit/c38b78ddfa000bb4b5ae92b31193ca19acaa9d17
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  [#2972] Overwrite path to solr core for Travis

  Commit: 027c09ada64334d263f78b6b2042440531779780
      https://github.com/ckan/ckan/commit/027c09ada64334d263f78b6b2042440531779780
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/lib/jinja_extensions.py
    M ckan/tests/controllers/test_package.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3005 from ckan/3005-update-jinja2

Update Jinja2 version

  Commit: 56ae1bd8f5e205db7731a11e728f826ef3b051b4
      https://github.com/ckan/ckan/commit/56ae1bd8f5e205db7731a11e728f826ef3b051b4
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/plugins/test_toolkit.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3042 from ckan/3041-helpererror

Raise HelperError exception when calling non-existing helper

  Commit: 2e6afc34f7b4e2b946188390c749de5ed97bd2fe
      https://github.com/ckan/ckan/commit/2e6afc34f7b4e2b946188390c749de5ed97bd2fe
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  [#2856] Create DataPusher task timestamps using UTC

When an upload to the DataPusher finishes we check
`resource['last_modified']` (in UTC) against `task['last_updated']`
to check whether it changed during the previous upload and resubmit it.
As `task['last_updated']` was created using `datetime.now()` this could
lead to infinite upload loops.

Discussion is here:

https://github.com/ckan/ckan/issues/2856#issuecomment-220383735

  Commit: 46be8f619a22ed41063c5a1ca7cc0ccca7cca544
      https://github.com/ckan/ckan/commit/46be8f619a22ed41063c5a1ca7cc0ccca7cca544
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  Merge pull request #3051 from ckan/2856-datapusher-tasks-utc

[#2856] Create DataPusher task timestamps using UTC

  Commit: 03973767c4751a51ea077012aa5dc1af4944c6a9
      https://github.com/ckan/ckan/commit/03973767c4751a51ea077012aa5dc1af4944c6a9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    R .travis.yml
    M Dockerfile
    M README.rst
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    R ckan/lib/lazyjson.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/index.html
    M ckan/templates/snippets/debug.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/plugins/test_toolkit.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3004-upgrade-babel

Conflicts:
	requirements.in

  Commit: dc3bb9eb01e8e266b97cc9e10f74e263988fd9b7
      https://github.com/ckan/ckan/commit/dc3bb9eb01e8e266b97cc9e10f74e263988fd9b7
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  Merge pull request #3050 from ckan/2972-solr-travis

Overwrite path to solr core for Travis in paster templates

  Commit: 28a95fd5d306453fbf6bf2bdea286a6ae23adfc3
      https://github.com/ckan/ckan/commit/28a95fd5d306453fbf6bf2bdea286a6ae23adfc3
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html
    M ckan/tests/controllers/test_home.py
    M ckan/tests/legacy/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3004 from ckan/3004-upgrade-babel

Upgrade Babel version

  Commit: 8d2418fd79eb7f3afbac8e419c1bae9589297b8c
      https://github.com/ckan/ckan/commit/8d2418fd79eb7f3afbac8e419c1bae9589297b8c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  Merge branch 'master' into poc-flask-views

Compare: https://github.com/ckan/ckan/compare/f87cc6a2bdd4...8d2418fd79eb