[ckan-changes] [okfn/ckan] 55c8ff: [#1359, licenses][s]: refactor to remove dependency...

Mon Feb 13 11:23:46 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 55c8ff6f108a1b9706b01ea68d875042639bfa9e
      https://github.com/okfn/ckan/commit/55c8ff6f108a1b9706b01ea68d875042639bfa9e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,licenses][s]: refactor to remove dependency on external licenses package.

* Inline list of default licenses (those from http://licenses.opendefinition.org/licenses/groups/ckan.json)
* Minor refactoring on initialization of LicenseRegister to support dicts or lists or licenses
* Fix up tests (now that we do not have gpl in our default lists of licenses)


  Commit: 19fc61ac56826407965438bdc5d973e20dc00dc0
      https://github.com/okfn/ckan/commit/19fc61ac56826407965438bdc5d973e20dc00dc0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/tests/forms/test_package.py

  Log Message:
  -----------
  [#1359,tests][xs]: fix up one test missed in previous commit (gpl -> odc-by for demo license).


  Commit: 8b89ced1da1e4a3126cc052dd339c74a090dd194
      https://github.com/okfn/ckan/commit/8b89ced1da1e4a3126cc052dd339c74a090dd194
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M doc/configuration.rst

  Log Message:
  -----------
  [#1359,doc][xs]: minor updates to docs re license_group_url to reflect new setup.


  Commit: a8b0e3b0cd453c2440e7dff5d82feab62e22057c
      https://github.com/okfn/ckan/commit/a8b0e3b0cd453c2440e7dff5d82feab62e22057c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  [#1359,licenses][xs]: remove unused method get_by_title on LicenseRegister.


  Commit: 2f789700af9ba20ed2970674c6504be8a33401d9
      https://github.com/okfn/ckan/commit/2f789700af9ba20ed2970674c6504be8a33401d9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/configuration.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,merge][s]: Merge branch 'feature-1359-license-choice-simplify' thereby fixes #1359.


Compare: https://github.com/okfn/ckan/compare/241687f...2f78970