[ckan-changes] [ckan/ckan] 119820: [#1462] Add guidelines for reviewing pull requests

GitHub noreply at github.com
Sun Jul 20 22:13:36 UTC 2014


  Branch: refs/heads/1838-fts-on-specific-columns
  Home:   https://github.com/ckan/ckan
  Commit: 11982065f59ba6c660a302f028d6deb8c47c22d8
      https://github.com/ckan/ckan/commit/11982065f59ba6c660a302f028d6deb8c47c22d8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  [#1462] Add guidelines for reviewing pull requests


  Commit: bd44fd53b5b338a8e967f6159cad4b8ffa07a349
      https://github.com/ckan/ckan/commit/bd44fd53b5b338a8e967f6159cad4b8ffa07a349
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/validators.py
    M ckan/new_tests/logic/test_validators.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/dataset.less
    M ckan/public/base/less/layout.less
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_related.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/db.py
    M ckanext/textpreview/tests/test_preview.py
    A doc/.gitignore
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1462-reviewing-guidelines


  Commit: 7f224c69c9ce5b6385aaacc3a7f3cf8674b4be03
      https://github.com/ckan/ckan/commit/7f224c69c9ce5b6385aaacc3a7f3cf8674b4be03
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-05-24 (Sat, 24 May 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#1709] Add resource extras to Solr index


  Commit: 6071824b9ed90d96d45a4564d041c5c228a33622
      https://github.com/ckan/ckan/commit/6071824b9ed90d96d45a4564d041c5c228a33622
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1815] Add "distinct" param to datastore_search

This allows the users to get only the distinct values of the query. The "total"
field on the returned data is related to all fields, not only the distincts.
For example, in our test we have the data:

```json
[
    {"author": "tolstoy", "title": "Anna Karenina"},
    {"author": "tolstoy", "title": "War and Peace"}
]
```

We want to get a list with all authors on the datastore resource. Then we query
the "datastore_search" with:

```json
{
    "resource_id": "the_resource_id",
    "fields": ["author"],
    "distinct": True
}
```

The result is;

```json
{
    "success": True,
    "total": 2,
    "records": [{"author": "tolstoy"}]
}
```

Note that even though there's only one returned record, the "total" field is 2. This is because "total" doesn't take into account the distinct values, but all rows that match our query.


  Commit: 06e731a974263261920b51d528e8f0520962ad49
      https://github.com/ckan/ckan/commit/06e731a974263261920b51d528e8f0520962ad49
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1830] datastore_search accepts multiple filters values as array

With this patch, if you query the datastore_search with filters:

```json
{
    "filters": {
  "country": ["Brazil", "Argentina"]
    }
}
```

It'll return the rows that have `country IN ("Brazil", "Argentina")`. I had to
change the `datastore_search` extension point on `IDatastore` because I needed
the fields' types. I needed the fields' types because the Datastore accept
fields with array type (e.g. `_text`). When filtering a field that has an array
type, I want to query literally.

In the sample query above, the Datastore can create two different queries,
depending on the type of the `country` field. If it's not an array type, it'll
do as I described above, querying `country IN ("Brazil", "Argentina")`. If it's
of an array type, it'll query literally `country = ["Brazil", "Argentina"]`.


  Commit: 4827d4603d7e91bc6b865c0a93df8d0751e962ae
      https://github.com/ckan/ckan/commit/4827d4603d7e91bc6b865c0a93df8d0751e962ae
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#1830] Keep the fields' order


  Commit: 8266afc881f87836744bbe1c7cd291425c905ec2
      https://github.com/ckan/ckan/commit/8266afc881f87836744bbe1c7cd291425c905ec2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1830] IDatastore.datastore_delete() receives fields_types

This is to keep it consistent with .datastore_search(), and make the code
started in d3761f8 work.


  Commit: b46b1af5ea80eed3691e46007998b5b218ff852b
      https://github.com/ckan/ckan/commit/b46b1af5ea80eed3691e46007998b5b218ff852b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1830] IDatastore.datastore_validate() receives fields_types

This is to keep it consistent with .datastore_search(), and make the code
started in d3761f8 work.


  Commit: 27cc2e950565499950f9b07523f6c395d335967b
      https://github.com/ckan/ckan/commit/27cc2e950565499950f9b07523f6c395d335967b
  Author: Erik Schwartz <eschwartz at codeforamerica.org>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Fix typo 'sucess' => 'success'


  Commit: 5f43452ccc659595340c0aadbfcb3b2c32e7f739
      https://github.com/ckan/ckan/commit/5f43452ccc659595340c0aadbfcb3b2c32e7f739
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #1831 from eeeschwartz/patch-1

Fix typo 'sucess' => 'success'


  Commit: 2dbf0c5bb93db80800ab69654b161bd5cce9a3b7
      https://github.com/ckan/ckan/commit/2dbf0c5bb93db80800ab69654b161bd5cce9a3b7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1830] Fix python2.6 support

To do so, we need to add the "ordereddict" requirement.


  Commit: 01cad43619a38646995873c38b7536b10cfd15c9
      https://github.com/ckan/ckan/commit/01cad43619a38646995873c38b7536b10cfd15c9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1830] Use OrderedDict from ckan.common to fix python2.6 support


  Commit: 40a4d8cd98ab81efedb46631dccb0fa67c7bf9b0
      https://github.com/ckan/ckan/commit/40a4d8cd98ab81efedb46631dccb0fa67c7bf9b0
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M CHANGELOG.rst
    A Dockerfile
    M bin/travis-install-dependencies
    M ckan/config/routing.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/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/vendor/jquery.min.js
    M ckan/templates/admin/base.html
    A ckan/templates/admin/trash.html
    M ckan/templates/footer.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/page.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/python.rst
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    M doc/theming/best-practices.rst
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1709-add-resource-extras-to-solr-index


  Commit: d56b1831b6b801d8bc9c06a50bc6ce4cfbdbc77b
      https://github.com/ckan/ckan/commit/d56b1831b6b801d8bc9c06a50bc6ce4cfbdbc77b
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

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

  Log Message:
  -----------
  [#1709] Add tests for resource extras indexing


  Commit: 2808b2dbb21fb79ad23c3b5a6bade04d9b200c69
      https://github.com/ckan/ckan/commit/2808b2dbb21fb79ad23c3b5a6bade04d9b200c69
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge pull request #1462 from ckan/1462-reviewing-guidelines

Write guidelines for how to review pull requests


  Commit: fa0294aa89fb10818bd9ec953b815228c3bb57a3
      https://github.com/ckan/ckan/commit/fa0294aa89fb10818bd9ec953b815228c3bb57a3
  Author: Ian Ward <ian at excess.org>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge remote-tracking branch 'rparrapy/1709-add-resource-extras-to-solr-index'


  Commit: ce890420afa10118f6e903cbe139afce7b059bf1
      https://github.com/ckan/ckan/commit/ce890420afa10118f6e903cbe139afce7b059bf1
  Author: amercader <amercadero at gmail.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1815-distinct-datastore-search'


  Commit: 4c4e8b5e91fd831cee5435d90b65856dd1e5eb7a
      https://github.com/ckan/ckan/commit/4c4e8b5e91fd831cee5435d90b65856dd1e5eb7a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py
    M doc/api/index.rst
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge branch 'master' into 1830


  Commit: 16f1c06f6ad2c5b14fc40fc390c4c7e84c84068d
      https://github.com/ckan/ckan/commit/16f1c06f6ad2c5b14fc40fc390c4c7e84c84068d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1830] Add tests for multiple filters on same field


  Commit: 9a28b1dbabe274fd15f103b4cb5185db3115d216
      https://github.com/ckan/ckan/commit/9a28b1dbabe274fd15f103b4cb5185db3115d216
  Author: amercader <amercadero at gmail.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1830-querying-multiple-values-on-the-datastore'


  Commit: e982acae7c26ba3a88b1aafca2046c1ae75773c4
      https://github.com/ckan/ckan/commit/e982acae7c26ba3a88b1aafca2046c1ae75773c4
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

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

  Log Message:
  -----------
  Small typo


  Commit: 35a9ec55be8ec9d3bc3d373c81f565cfcc09bab4
      https://github.com/ckan/ckan/commit/35a9ec55be8ec9d3bc3d373c81f565cfcc09bab4
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #1848 from morty/small-typo

[#1848] Small typo


  Commit: cbb08202f18f3079c12eb01ee84def52b2621723
      https://github.com/ckan/ckan/commit/cbb08202f18f3079c12eb01ee84def52b2621723
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/tests/functional/api/test_package_search.py
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py
    M doc/api/index.rst
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge branch 'master' into 1838-fts-on-specific-columns

Conflicts:
	ckanext/datastore/plugin.py


Compare: https://github.com/ckan/ckan/compare/1210ebe3b1d5...cbb08202f18f


More information about the ckan-changes mailing list