[ckan-changes] [okfn/ckan] 882a72: [#1314] Single Solr schema file

Wed Dec 4 17:56:41 UTC 2013

  Branch: refs/heads/1349-tests-for-theming-example-plugins
  Home:   https://github.com/okfn/ckan
  Commit: 882a7274667b8f76bf801f88544d657e13c2d66c
      https://github.com/okfn/ckan/commit/882a7274667b8f76bf801f88544d657e13c2d66c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/travis-run-tests
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/tests/lib/test_solr_schema_version.py
    M doc/appendices/solr-multicore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1314] Single Solr schema file

To make easier to track changes and simplify the deplyment and upgrade,
the Solr schema file included in the CKAN source is now unified under
`schema.xml`.

As part of the release process, the file will be checked for changes,
and if present the version numbers on the schema file and the supported
versions list will be updated.

Release, install and upgrade docs have been updated to reflect this
changes.

Travis now also always points to schema.xml

  Commit: 38f1e30eaa41f219cebbb5f08e28772f2968c181
      https://github.com/okfn/ckan/commit/38f1e30eaa41f219cebbb5f08e28772f2968c181
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Upgrade the OKFN Sphinx theme to the version we had before

Somehow it got downgraded

  Commit: 41baadecfb3a3ae000a3d2ae65c8b765691df9ed
      https://github.com/okfn/ckan/commit/41baadecfb3a3ae000a3d2ae65c8b765691df9ed
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M MANIFEST.in
    M bin/travis-install-dependencies
    M ckan/controllers/package.py
    M ckan/logic/__init__.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    M ckan/templates/admin/config.html
    M ckan/templates/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    R ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1314-solr-schema-single-file

  Commit: ca008e84cec6a909a7c0cd3cc48d7d5dc25f3cda
      https://github.com/okfn/ckan/commit/ca008e84cec6a909a7c0cd3cc48d7d5dc25f3cda
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M doc/contents.rst

  Log Message:
  -----------
  Add user guide and sysadmin guide to docs toc

These seem to have got removed somehow

  Commit: c0a3958ed4e330a8923651990dcdebcbfcfdb99a
      https://github.com/okfn/ckan/commit/c0a3958ed4e330a8923651990dcdebcbfcfdb99a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Fix a Sphinx warning

  Commit: 817725b9f7dcee94e87b47de6740029f5909f938
      https://github.com/okfn/ckan/commit/817725b9f7dcee94e87b47de6740029f5909f938
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/contents.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1314-solr-schema-single-file

  Commit: 02d3f60f4c0593e11a51c0ad87cf8a6cd7ece3e8
      https://github.com/okfn/ckan/commit/02d3f60f4c0593e11a51c0ad87cf8a6cd7ece3e8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M doc/release-process.rst

  Log Message:
  -----------
  [#1314] Fix a Sphinx warning

  Commit: 82cdbb83c4724dc905ff7f5b4a3b9461c627f66d
      https://github.com/okfn/ckan/commit/82cdbb83c4724dc905ff7f5b4a3b9461c627f66d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/travis-run-tests
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/tests/lib/test_solr_schema_version.py
    M doc/appendices/solr-multicore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch '1314-solr-schema-single-file'

  Commit: 1850b66333f39fb6b32f61f1ecbf1dd8d5b66dc0
      https://github.com/okfn/ckan/commit/1850b66333f39fb6b32f61f1ecbf1dd8d5b66dc0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/travis-run-tests
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/tests/lib/test_solr_schema_version.py
    M doc/_themes/sphinx-theme-okfn
    M doc/appendices/solr-multicore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1349-tests-for-theming-example-plugins

  Commit: 15bc6cd7bf80803f4335329aead744803ab260b6
      https://github.com/okfn/ckan/commit/15bc6cd7bf80803f4335329aead744803ab260b6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Remove an unused import

  Commit: f3fc7ef1eaf94f17873a8a9a7664a6bd41cdc597
      https://github.com/okfn/ckan/commit/f3fc7ef1eaf94f17873a8a9a7664a6bd41cdc597
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Typo

  Commit: d6c4e2047512bd94b9d12a21d15877d98bf4ab1f
      https://github.com/okfn/ckan/commit/d6c4e2047512bd94b9d12a21d15877d98bf4ab1f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Rename a private test helper function

So that nose doesn't think it's a test function

  Commit: 3d59b5adfbd7c9527fe5b1992d11e556b158bfae
      https://github.com/okfn/ckan/commit/3d59b5adfbd7c9527fe5b1992d11e556b158bfae
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M setup.py

  Log Message:
  -----------
  [#1349] Rename an example plugin class

Using the same name for this empty plugin class as for other plugin
classes was causing a plugin loading problem when running the tests.

  Commit: ddcf5dcad982be634468319d725f7f960a1c9b54
      https://github.com/okfn/ckan/commit/ddcf5dcad982be634468319d725f7f960a1c9b54
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#1349] Clear extra_template_paths on plugin unload

  Commit: ed16279cf3be78d0d6795c07386a0bde8c88ad4f
      https://github.com/okfn/ckan/commit/ed16279cf3be78d0d6795c07386a0bde8c88ad4f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Fix a test setup method

  Commit: 6a726004bded8ff0feb30bcd5c57d3fc5695c33d
      https://github.com/okfn/ckan/commit/6a726004bded8ff0feb30bcd5c57d3fc5695c33d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Reset ckan.legacy_templates after changing it in tests

  Commit: 5ab0cae25419b6f909e50b4f99155281670c6986
      https://github.com/okfn/ckan/commit/5ab0cae25419b6f909e50b4f99155281670c6986
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Fix some HTML parsing in tests

  Commit: 8a8ff2d93fd71acf65a8c2e9604abdd69ed6fba4
      https://github.com/okfn/ckan/commit/8a8ff2d93fd71acf65a8c2e9604abdd69ed6fba4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py

  Log Message:
  -----------
  [#1349] Tidy up some test code

  Commit: 0a0dea06194164946c6fa27ac658f435313a6142
      https://github.com/okfn/ckan/commit/0a0dea06194164946c6fa27ac658f435313a6142
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckanext/example_theme/tests/test_example_theme.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py

  Log Message:
  -----------
  [#1349] PEP-8

Compare: https://github.com/okfn/ckan/compare/7a295f900cce...0a0dea061941