[ckan-changes] [okfn/ckan] cb1288: Prevent version *.pyc conflicts

Wed Nov 21 19:55:25 UTC 2012

  Branch: refs/heads/2939-orgs
  Home:   https://github.com/okfn/ckan
  Commit: cb128801c78ccc1ad445c1e8dd8f07ad734295c9
      https://github.com/okfn/ckan/commit/cb128801c78ccc1ad445c1e8dd8f07ad734295c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Prevent version *.pyc conflicts

  Commit: d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
      https://github.com/okfn/ckan/commit/d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  fix sa warning in tests/functional/api/test_activity.py:TestActivity.test_create_group

  Commit: b61100b36b3ca168a5ad38fe0b0b4bcf43bc6eab
      https://github.com/okfn/ckan/commit/b61100b36b3ca168a5ad38fe0b0b4bcf43bc6eab
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Tweak 'Feature Branches' coding standards

  Commit: c79a4e5865b4305189cc132cac85d29f39d7f17a
      https://github.com/okfn/ckan/commit/c79a4e5865b4305189cc132cac85d29f39d7f17a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Collect How to Contribute notes into one place

Collect notes about how to contribute to CKAN (github fork, feature
branches, commit messages, pull requests & code review, merging) from
different parts of the Coding Standards docs page and the Submitting a
code patch and Becoming a CKAN Developer pages on the old wiki.ckan.org.
Put them all together at the top of the coding standards.

Removed the section about submitting code patches by email.

  Commit: de978e225e42623d6ecff25936cd2338a777596e
      https://github.com/okfn/ckan/commit/de978e225e42623d6ecff25936cd2338a777596e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Clarify import standards

  Commit: 312485717b222d11da119a66145cf9f3ac5d6ded
      https://github.com/okfn/ckan/commit/312485717b222d11da119a66145cf9f3ac5d6ded
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Tweak logging standards

Link to the Python docs not a blog that paraphrases them, and no need to
copy-paste the log levels table into our docs.

  Commit: 993e6c0ed318ef0f732dab94624a97532e672319
      https://github.com/okfn/ckan/commit/993e6c0ed318ef0f732dab94624a97532e672319
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Coding standards: use str.format() everywhere not just in i18n strings

  Commit: 0d57e5a862b18a9cffb5efea5df0ec363e80d0c6
      https://github.com/okfn/ckan/commit/0d57e5a862b18a9cffb5efea5df0ec363e80d0c6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Docs: clarify "PEP 257" section title

  Commit: 5a78896edd8023301c9ae0d2acb278fc920172b6
      https://github.com/okfn/ckan/commit/5a78896edd8023301c9ae0d2acb278fc920172b6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Docs: tweak docstring standards

  Commit: 39cf032397f7d7c3856e4d7e2df4f1807bb2d342
      https://github.com/okfn/ckan/commit/39cf032397f7d7c3856e4d7e2df4f1807bb2d342
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Fix section title hierarchy

The section title styles used in the coding standards page were
inconsistent and some of the titles were not being rendered as a result

  Commit: 3abe61de7c83cf8dd3d0170a193cd2bd5bee15ff
      https://github.com/okfn/ckan/commit/3abe61de7c83cf8dd3d0170a193cd2bd5bee15ff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Add section about keeping up with master

  Commit: 72d6421f1efc6cc90c34c15f0b589698e15c71c0
      https://github.com/okfn/ckan/commit/72d6421f1efc6cc90c34c15f0b589698e15c71c0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Docs: updates code quality links

  Commit: 0a4dcca1ae172db1c4f8e26c68cd534b98d6b9e6
      https://github.com/okfn/ckan/commit/0a4dcca1ae172db1c4f8e26c68cd534b98d6b9e6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Add some details to CKAN Code Architecture section

  Commit: a0c1e38d323b3a85f79e2d3cb49ef7771545e873
      https://github.com/okfn/ckan/commit/a0c1e38d323b3a85f79e2d3cb49ef7771545e873
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    A doc/architecture.rst
    R doc/coding-standards.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    A doc/javascript-coding-standards.rst
    A doc/python-coding-standards.rst

  Log Message:
  -----------
  Split coding standards into separate files

  Commit: cfbcfd1e5c4a89d662c2eab7ed9f9812eb111d4e
      https://github.com/okfn/ckan/commit/cfbcfd1e5c4a89d662c2eab7ed9f9812eb111d4e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    R doc/buildbot.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    M doc/index.rst

  Log Message:
  -----------
  Remove old docs about the domain model and buildbot

These are all out of date and incomplete

  Commit: a826eb662941fc031684967aa7bf7e1253137dc0
      https://github.com/okfn/ckan/commit/a826eb662941fc031684967aa7bf7e1253137dc0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    A doc/contributing-docs.rst
    M doc/index.rst

  Log Message:
  -----------
  Docs: add how to contribute to docs docs

  Commit: d49dea43775560b25338a76c47c6a2e4213d9f12
      https://github.com/okfn/ckan/commit/d49dea43775560b25338a76c47c6a2e4213d9f12
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/architecture.rst
    A doc/migration.rst

  Log Message:
  -----------
  Docs: Code archotecture tidy up

Add a couple of tips to the CKAN Code Architecture docs and tidy it up a
bit, including moving the Creating a new migration script section into
its own page.

  Commit: 4c7d7aff6f57286f84e14fecf65d5a08beda32d9
      https://github.com/okfn/ckan/commit/4c7d7aff6f57286f84e14fecf65d5a08beda32d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Docs: don't repeat parts of PEP 8

Don't repeat parts of PEP 8 in the Python Coding Standards docs, just
link to it once.

  Commit: ea22435b43d608005504508a252c2b9f4c6bb50d
      https://github.com/okfn/ckan/commit/ea22435b43d608005504508a252c2b9f4c6bb50d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Docs: add a couple of Python code style links

  Commit: a14db47c4598f827423087cc9362f40ef2ae5b59
      https://github.com/okfn/ckan/commit/a14db47c4598f827423087cc9362f40ef2ae5b59
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan_deb/usr/lib/ckan/common.sh
    M doc/datastore-setup.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Make sure database encoding is utf-8

  Commit: 18f306c39f12daf211eb7fa72b69155d45a09c5a
      https://github.com/okfn/ckan/commit/18f306c39f12daf211eb7fa72b69155d45a09c5a
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Re-compiled main.css

  Commit: 90a342c53e6940de3bec59c207e9da96c22939cd
      https://github.com/okfn/ckan/commit/90a342c53e6940de3bec59c207e9da96c22939cd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch 'remove-migrate-versions-on-clean'

  Commit: 0326af359aaf6a85eb0f047f7113aca34e9b7365
      https://github.com/okfn/ckan/commit/0326af359aaf6a85eb0f047f7113aca34e9b7365
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/test_dashboard.py

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

  Commit: 611b87ad94feaca192c09b18c05b03a4b92720d4
      https://github.com/okfn/ckan/commit/611b87ad94feaca192c09b18c05b03a4b92720d4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  Fix a crash in dashboard_activity_list auth

Fix the dashboard_activity_list auth function to not crash when no user
is logged in, and add some tests for this case.

  Commit: 9c5f314efcccc90f1980ce8a0ea807f81de17a38
      https://github.com/okfn/ckan/commit/9c5f314efcccc90f1980ce8a0ea807f81de17a38
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Add a couple of FIXMEs that should be done after 2939-orgs is merged

  Commit: 996d1b27bec65a9209538d2fd4c44a06d602f1a7
      https://github.com/okfn/ckan/commit/996d1b27bec65a9209538d2fd4c44a06d602f1a7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/auth/get.py
    M ckan/public/base/css/main.css
    M ckan/tests/functional/api/test_dashboard.py
    M ckan_deb/usr/lib/ckan/common.sh
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    A doc/contributing-docs.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    M doc/datastore-setup.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into fix-SA-warning

  Commit: a8de2f027371b6a08b68b1ce890840fca5e57a6a
      https://github.com/okfn/ckan/commit/a8de2f027371b6a08b68b1ce890840fca5e57a6a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch 'fix-SA-warning'

  Commit: a6392b5ba64e5fa91fffeefc28e0974a028a3dda
      https://github.com/okfn/ckan/commit/a6392b5ba64e5fa91fffeefc28e0974a028a3dda
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Add a FIXME for an unhandled case

  Commit: b0f19c95209e61057e93b78e20cc50ae5b45ae63
      https://github.com/okfn/ckan/commit/b0f19c95209e61057e93b78e20cc50ae5b45ae63
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  Merge branch 'bug-dashboard-activity-list-auth'

  Commit: 9ed808b81c908775b9c6e7b9c570707cdc97d5d1
      https://github.com/okfn/ckan/commit/9ed808b81c908775b9c6e7b9c570707cdc97d5d1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  Add a step to the source install docs

It seems it's sometimes necessary to deactivate and reactivate your
virtualenv after installing everything, to get the copy of paster right.

  Commit: a1f8c1c622a81a611ccd91cbdf6f304f6311967d
      https://github.com/okfn/ckan/commit/a1f8c1c622a81a611ccd91cbdf6f304f6311967d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan_deb/usr/lib/ckan/common.sh
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    A doc/contributing-docs.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    M doc/datastore-setup.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge branch 'master' into 2939-orgs

Conflicts:
	ckan/logic/auth/get.py

dashboard authorizations FIXMEs amended otherwise non-issue

Compare: https://github.com/okfn/ckan/compare/2940296a7ade...a1f8c1c622a8