[ckan-changes] [ckan/ckan] ca8d5f: added ckanext/datastore/set_permissions.sql templa...

Thu Jan 15 11:49:15 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: ca8d5f84cdb47f21264b705a605078717ef83edc
      https://github.com/ckan/ckan/commit/ca8d5f84cdb47f21264b705a605078717ef83edc
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  added ckanext/datastore/set_permissions.sql template to manifest

  Commit: decb4e69a7888276a53b1890705fff2f38edd4b7
      https://github.com/ckan/ckan/commit/decb4e69a7888276a53b1890705fff2f38edd4b7
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Show Upload Log even when the job has errored

Show the datapusher Upload Log on the resource_data page even when the
datapusher job has errored.

  Commit: 9a05dbcf9cce6d92f16abe067f0572d946cf3e03
      https://github.com/ckan/ckan/commit/9a05dbcf9cce6d92f16abe067f0572d946cf3e03
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Use the string error message from datapusher error dicts

Rather than showing the whole dict as a string.

  Commit: 9ff14ece784a52b6b37e408c91cbc5364acda4df
      https://github.com/ckan/ckan/commit/9ff14ece784a52b6b37e408c91cbc5364acda4df
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Display all keys from datapusher job errors

The "error" dicts in CKAN Service Provider job dicts always contain a
"message" key with a string error message, but may also contain any
other keys (depending on the type of error) - show those other keys on
the resource data page as well.

  Commit: dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
      https://github.com/ckan/ckan/commit/dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  Improve DataStore's error message on invalid data

When adding data to the datastore it may come across an invalid data value
(e.g. a non-numeric string, when the column has a numeric type).

Sqlalchemy will raise its DataError. Catch this and raise a custom
InvalidDataError. The datastore_create() action then catches this and raises
toolkit.ValidationError which ends up returning an error dict to the API
caller.

I'm not sure if this commit covers all cases - e.g. create vs updating a
datastore resource.

  Commit: 75957ff72fb60538ff0b4e0dd222135729d58abe
      https://github.com/ckan/ckan/commit/75957ff72fb60538ff0b4e0dd222135729d58abe
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Change a DataStore error message

Make it a little more human-friendly

  Commit: 61faa2761a3e45af6a63dd82b087d6c59889dc3e
      https://github.com/ckan/ckan/commit/61faa2761a3e45af6a63dd82b087d6c59889dc3e
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  PEP8

  Commit: 12ccd3f7c872b48205ebff5c1c0e883d49e57725
      https://github.com/ckan/ckan/commit/12ccd3f7c872b48205ebff5c1c0e883d49e57725
  Author: Matthew Moore <matt at edward>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Added commands for removing nginx and apache default sites

  Commit: 43379b14b4687ca788b463e16702b9dd07104c4b
      https://github.com/ckan/ckan/commit/43379b14b4687ca788b463e16702b9dd07104c4b
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] fix test for #1764 regression

  Commit: 573d6f146f323a863bd7a091ad95654eb7f94265
      https://github.com/ckan/ckan/commit/573d6f146f323a863bd7a091ad95654eb7f94265
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] separately test both regressions, fix indexing

  Commit: 290850554bfff7e22e8cd0410074eb41b68b3563
      https://github.com/ckan/ckan/commit/290850554bfff7e22e8cd0410074eb41b68b3563
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Support error message from older datapusher versions

  Commit: 59975ba0a23cd26bc72c096bdbe381feb34ea3b5
      https://github.com/ckan/ckan/commit/59975ba0a23cd26bc72c096bdbe381feb34ea3b5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Add another common example to error message

Inserting a value with a different type from the field one is a common
error, so hopefully this will give more clues (see #1964, #1963)

  Commit: a340a0424672a3289ab3513d17e20f53ae3e5476
      https://github.com/ckan/ckan/commit/a340a0424672a3289ab3513d17e20f53ae3e5476
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  [#2197] Remove redundant less import

  Commit: 3d0634a08ba44bf66b057c048484798b33f9900c
      https://github.com/ckan/ckan/commit/3d0634a08ba44bf66b057c048484798b33f9900c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into improve-datapusher-error-messages

Conflicts:
	ckanext/datastore/tests/test_db.py

  Commit: 68dba74b7f06d4c9f250b7a7bf3188e90be881a0
      https://github.com/ckan/ckan/commit/68dba74b7f06d4c9f250b7a7bf3188e90be881a0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_data.html
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  Merge branch 'improve-datapusher-error-messages'

  Commit: ba235180d41a5edaab97287efd5a5a177ca7b983
      https://github.com/ckan/ckan/commit/ba235180d41a5edaab97287efd5a5a177ca7b983
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch '2197-less-import-error' of https://github.com/brew/ckan into brew-2197-less-import-error

  Commit: 663bf9ac1f72f3899c511706443c9c5a7b994b5e
      https://github.com/ckan/ckan/commit/663bf9ac1f72f3899c511706443c9c5a7b994b5e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch 'brew-2197-less-import-error'

  Commit: b7905a6a776aa4d161dd323c7564cb1fe49d8855
      https://github.com/ckan/ckan/commit/b7905a6a776aa4d161dd323c7564cb1fe49d8855
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch '2208-remove-redundant-validated-data-dict' of https://github.com/wardi/ckan into wardi-2208-remove-redundant-validated-data-dict

  Commit: 5afd4afc1ab6a055e2336e13a4741908646975fb
      https://github.com/ckan/ckan/commit/5afd4afc1ab6a055e2336e13a4741908646975fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch 'wardi-2208-remove-redundant-validated-data-dict'

  Commit: 1260dd9d998ed037bc3f353e0ca8af619f04e061
      https://github.com/ckan/ckan/commit/1260dd9d998ed037bc3f353e0ca8af619f04e061
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'deployment-doc-fix' of https://github.com/mattrm/ckan into mattrm-deployment-doc-fix

  Commit: d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
      https://github.com/ckan/ckan/commit/d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'mattrm-deployment-doc-fix'

  Commit: 19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
      https://github.com/ckan/ckan/commit/19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch '2112-add-set-permissions-template-to-manifest.in' of https://github.com/florianm/ckan into florianm-2112-add-set-permissions-template-to-manifest.in

  Commit: b24f1fee55190f23be83bc9762fe6894af5a3260
      https://github.com/ckan/ckan/commit/b24f1fee55190f23be83bc9762fe6894af5a3260
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch 'florianm-2112-add-set-permissions-template-to-manifest.in'

Compare: https://github.com/ckan/ckan/compare/7dac7f5ea9cf...b24f1fee5519