[ckan-changes] [ckan/ckan] ab3fab: Fix for https://github.com/ckan/ckan/issues/3569

Fri Jun 30 09:44:54 UTC 2017

  Branch: refs/heads/dev-v2.7
  Home:   https://github.com/ckan/ckan
  Commit: ab3fabc60c882ef4bda05d71fa63ece3ac3babe4
      https://github.com/ckan/ckan/commit/ab3fabc60c882ef4bda05d71fa63ece3ac3babe4
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Fix for https://github.com/ckan/ckan/issues/3569
Apply environment variables, always; no need to use ckan.ini (see https://github.com/ckan/ckan/pull/3572#issuecomment-303596016)
Allow connection to postgres via docker instead of coming via external port mapping
Includes a workaround for https://github.com/ckan/ckan/issues/3594
One remaining problem: the redis URL does not make it into CKAN despite using correct environment variable(?). Hence WIP label; but this will commit will already improve those suffering from completely broken docker-compose functionality.

  Commit: 4f8230b4a453e8a558acdd27572a19628de5d1be
      https://github.com/ckan/ckan/commit/4f8230b4a453e8a558acdd27572a19628de5d1be
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Test for Redis AFTER we've loaded config from environment variables

  Commit: bd7fe19d87ce06f5e9a28c7d81dede06f19a0dd5
      https://github.com/ckan/ckan/commit/bd7fe19d87ce06f5e9a28c7d81dede06f19a0dd5
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Reduce environment variables to those needed
I finally understood what's going on here: linked containers really do lead to environment variables as implied by the entrypoint script. However there is a difference in behaviour betweenstandard linking of containers and docker-compose networking. With docker, we get the IP addresses, but to access accompanying containers in docker-compose we have to use the container names. Therefore in principle we don't need to set all these variables, but we do need to override the host name ones.

  Commit: f04d65a4ffb8a6ec584efdf7bb728cc9be156bc4
      https://github.com/ckan/ckan/commit/f04d65a4ffb8a6ec584efdf7bb728cc9be156bc4
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Add a comment to advise on start-order problem

  Commit: 318787e0ac3a191810ab46bf87d67d0e634bf959
      https://github.com/ckan/ckan/commit/318787e0ac3a191810ab46bf87d67d0e634bf959
  Author: amercader <amercadero at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  [#3644] Fix activity test to use utcnow

  Commit: fb2d93f630346a4758858f2514fa68b97f1db8d7
      https://github.com/ckan/ckan/commit/fb2d93f630346a4758858f2514fa68b97f1db8d7
  Author: iewil <liwei at data.gov.sg>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  Changed required permission from 'update' to 'manage_group'

  Commit: c7f8cc727b91b7830c3cacfb0936bf9485b4becb
      https://github.com/ckan/ckan/commit/c7f8cc727b91b7830c3cacfb0936bf9485b4becb
  Author: amercader <amercadero at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  Catch invalid sort param exception

Providing a sort param like `sort=title xx desc` or `sort=title xx`
causes an exception due to an uncaught `ValidationError`

  Commit: ab6ccb80f41840133e48bb659ff7f00760497cbb
      https://github.com/ckan/ckan/commit/ab6ccb80f41840133e48bb659ff7f00760497cbb
  Author: amercader <amercadero at gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  pep8 fix

  Commit: 7e3f52a38bf9a6a9efcbf62e46a2357607096998
      https://github.com/ckan/ckan/commit/7e3f52a38bf9a6a9efcbf62e46a2357607096998
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/model/package.py
    M ckan/tests/legacy/models/test_package_relationships.py

  Log Message:
  -----------
  Choose direction of recreated relationship depending on its type

  Commit: c281c7a96fe9c75094da914872581a0d2727556a
      https://github.com/ckan/ckan/commit/c281c7a96fe9c75094da914872581a0d2727556a
  Author: Aleksandar Jovanov <aleksandar.jovanov at keitaro.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2228] Fix render_datetime error for year before 1900

There is a bug in Python in datetime.strftime where if a passed year is before 1900 it will raise a ValueError

  Commit: aab7af8223700c848582498ccc77372a1552e88b
      https://github.com/ckan/ckan/commit/aab7af8223700c848582498ccc77372a1552e88b
  Author: Aleksandar Jovanov <aleksandar.jovanov at keitaro.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#2228] Add additional test for render_datetime

  Commit: 65daa289c765fadd28532b666f134f02ebd8b143
      https://github.com/ckan/ckan/commit/65daa289c765fadd28532b666f134f02ebd8b143
  Author: Aleksandar Jovanov <aleksandar.jovanov at keitaro.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2228] Use regexp to replace year

  Commit: 325e783f399226a89c478929179c365d5ad70d83
      https://github.com/ckan/ckan/commit/325e783f399226a89c478929179c365d5ad70d83
  Author: Aleksandar Jovanov <aleksandar.jovanov at keitaro.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#2228] Add additional test for render_datetime

  Commit: 4169bf90bb68d45a9e96379f64297905f9836765
      https://github.com/ckan/ckan/commit/4169bf90bb68d45a9e96379f64297905f9836765
  Author: Carl Lange <carl at flax.ie>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Don't a 500 when printing the validation errors.

If there's no 'resources' key, or the error is on a different resource,
just prints the base error_dict.

Compare: https://github.com/ckan/ckan/compare/88927340e16b...4169bf90bb68