QGOV changes by ThrawnCA · Pull Request #59 · conwetlab/ckanext-datarequests

ThrawnCA · 2022-07-13T05:31:43Z

Enhancements from qld-gov-au fork.

Add compatibility with CKAN 2.9 and Python 3
Add GitHub Actions continuous integration testing with Behave scenario tests.
Add option to record data request closing circumstances.
Use UTC time internally so we can render it to the user consistently.
Clean up to make Flake8 happy.

Bump coveralls from 2.0.0 to 2.1.1

Bump lxml from 4.5.1 to 4.5.2

Develop to master

Bumps [requests](https://github.com/psf/requests) from 2.11.1 to 2.24.0. **This update includes a security fix.** - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md) - [Commits](psf/requests@v2.11.1...v2.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bumps [python-magic](https://github.com/ahupp/python-magic) from 0.4.12 to 0.4.18. - [Release notes](https://github.com/ahupp/python-magic/releases) - [Changelog](https://github.com/ahupp/python-magic/blob/master/CHANGELOG) - [Commits](ahupp/python-magic@0.4.12...0.4.18) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bumps [coveralls](https://github.com/coveralls-clients/coveralls-python) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/coveralls-clients/coveralls-python/releases) - [Changelog](https://github.com/coveralls-clients/coveralls-python/blob/master/CHANGELOG.md) - [Commits](TheKevJames/coveralls-python@2.1.1...2.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bump coveralls from 2.1.1 to 2.1.2

[Security] Bump requests from 2.11.1 to 2.24.0

…4.18 Bump python-magic from 0.4.12 to 0.4.18

Bumps [progressbar](https://github.com/niltonvolpato/python-progressbar) from 2.3 to 2.5. - [Release notes](https://github.com/niltonvolpato/python-progressbar/releases) - [Changelog](https://github.com/niltonvolpato/python-progressbar/blob/master/ChangeLog.yaml) - [Commits](https://github.com/niltonvolpato/python-progressbar/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bump progressbar from 2.3 to 2.5

Bumps [six](https://github.com/benjaminp/six) from 1.11.0 to 1.15.0. - [Release notes](https://github.com/benjaminp/six/releases) - [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES) - [Commits](benjaminp/six@1.11.0...1.15.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bumps [xlrd](https://github.com/python-excel/xlrd) from 1.0.0 to 1.2.0. - [Release notes](https://github.com/python-excel/xlrd/releases) - [Changelog](https://github.com/python-excel/xlrd/blob/master/docs/changes.rst) - [Commits](python-excel/xlrd@1.0.0...1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bump six from 1.11.0 to 1.15.0

Bump xlrd from 1.0.0 to 1.2.0

Bumps [lxml](https://github.com/lxml/lxml) from 4.5.2 to 4.6.3. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](lxml/lxml@lxml-4.5.2...lxml-4.6.3) Signed-off-by: dependabot[bot] <support@github.com>

Upgrade to GitHub-native Dependabot

…equests into dependabot/pip/lxml-4.6.3

- normalise whitespace and imports - replace 'dict' and 'set' calls with literals and comprehensions - fix clashing names - use 'six' to replace obsolete calls

Bump lxml from 4.5.2 to 4.6.3

…equests into QOL-7970-CKAN-2.9

QOL-8952 expand dataset selection for closing data request

Develop to master

- Explicitly mark relative imports so Py3 is happy - Make better use of CKAN toolkit API

- 'h' is now imported into 'actions' at the top level

- mock toolkit.render instead of base.render_jinja2

- mock 'get_action' function directly instead of via 'tk'

- Returning something is necessary under Flask

- put assert_equals first so we can tell what value was actually returned if it's wrong

- execution should end immediately, so 'render' won't get called

- We need extra logic to check the validation outcome, but the page will still be rendered

QOL-9055 Prepare for Amazon Linux 2

- ensure redirects are actioned, not thrown away

- expect a redirect if no validation errors

QOL-9055 fix handling of POST requests

Develop to master

ThrawnCA and others added 30 commits July 24, 2020 10:46

Merge pull request #39 from qld-gov-au/dependabot/pip/coveralls-2.1.1

6938bf2

Bump coveralls from 2.0.0 to 2.1.1

add dependencies on QA extensions now required by ckanext-data-qld

4d28ff5

initialise QA tables

c7cff15

initialise archival and reporting tables

279d64d

Merge pull request #40 from qld-gov-au/dependabot/pip/lxml-4.5.2

8fcb3fd

Bump lxml from 4.5.1 to 4.5.2

Merge pull request #41 from qld-gov-au/develop

8241bcf

Develop to master

Merge pull request #47 from qld-gov-au/dependabot/pip/coveralls-2.1.2

93a6677

Bump coveralls from 2.1.1 to 2.1.2

Merge pull request #45 from qld-gov-au/dependabot/pip/requests-2.24.0

93a6add

[Security] Bump requests from 2.11.1 to 2.24.0

Merge pull request #46 from qld-gov-au/dependabot/pip/python-magic-0.…

df51f99

…4.18 Bump python-magic from 0.4.12 to 0.4.18

Merge pull request #42 from qld-gov-au/dependabot/pip/progressbar-2.5

a8e25ba

Bump progressbar from 2.3 to 2.5

Merge pull request #44 from qld-gov-au/dependabot/pip/six-1.15.0

69c8211

Bump six from 1.11.0 to 1.15.0

Merge pull request #43 from qld-gov-au/dependabot/pip/xlrd-1.2.0

1996f00

Bump xlrd from 1.0.0 to 1.2.0

Upgrade to GitHub-native Dependabot

8246be1

update 'requests' to handle a wider range of dependencies

af078d4

replace obsolete data_qld combined plugin

fb4451b

add data_qld_integration plugin

0075487

Merge pull request #50 from qld-gov-au/dependabot/add-v2-config-file

f875d6c

Upgrade to GitHub-native Dependabot

Merge branch 'develop' of https://github.com/qld-gov-au/ckanext-datar…

71ab931

…equests into dependabot/pip/lxml-4.6.3

[QOL-7970] clean up for Flake8 and Python 3

f6f9808

- normalise whitespace and imports - replace 'dict' and 'set' calls with literals and comprehensions - fix clashing names - use 'six' to replace obsolete calls

Merge pull request #49 from qld-gov-au/dependabot/pip/lxml-4.6.3

cc26433

Bump lxml from 4.5.2 to 4.6.3

Merge branch 'develop' of https://github.com/qld-gov-au/ckanext-datar…

dc4a3cd

…equests into QOL-7970-CKAN-2.9

[QOL-7970] oops fix six module name

6c289e2

[QOL-7970] update tests to replace 'paster' with 'ckan' as needed

92f2f81

ThrawnCA and others added 30 commits June 20, 2022 15:20

Merge pull request #67 from qld-gov-au/QOL-8952-data-request-closing

6ca484f

QOL-8952 expand dataset selection for closing data request

Merge pull request #68 from qld-gov-au/develop

bbb3c08

Develop to master

[QOL-9055] clean up imports

9437721

- Explicitly mark relative imports so Py3 is happy - Make better use of CKAN toolkit API

[QOL-9055] explicitly mark relative db import

72f2fec

[QOL-9055] revert interactions with toolkit API to fix test mocks

6552e23

[QOL-9055] mark test module to enable relative imports

d564299

[QOL-9055] oops restore 'tk' reference to render call

ffd1cfa

[QOL-9055] revert toolkit access to fix tests

902dff5

[QOL-9055] drop obsolete test mocks

c8771a3

[QOL-9055] drop obsolete test mock

3a59b1f

[QOL-9055] update mockery of helpers

345ad33

- 'h' is now imported into 'actions' at the top level

[QOL-9055] adjust test mocks

0cd5506

- mock toolkit.render instead of base.render_jinja2

[QOL-9055] adjust test mocks

19dc15a

- mock 'get_action' function directly instead of via 'tk'

[QOL-9055] use 'c' import instead of double-handling

d7184ed

[QOL-9055] clean up scenario tests

24b2f55

[QOL-9055] fix controller tests to handle a response on abort

ae1894d

- Returning something is necessary under Flask

[QOL-9055] use 'return_value' not 'side_effect' for regular return

27883c4

[QOL-9055] add test mock for the 'h' import

f93e58e

[QOL-9055] swap test assertions for clearer debugging

dd5d9b6

- put assert_equals first so we can tell what value was actually returned if it's wrong

[QOL-9055] fix test assertions after calling 'abort'

e23e3d1

- execution should end immediately, so 'render' won't get called

[QOL-9055] fix test spelling of 'comment'

4fbf611

[QOL-9055] fix test to not expect 'abort' on validation error

ea66906

- We need extra logic to check the validation outcome, but the page will still be rendered

[QOL-9055] provide CKAN version for CircleCI build

e1c1e5b

Merge pull request #69 from qld-gov-au/QOL-9055-amazon-linux-2

f5ce23a

QOL-9055 Prepare for Amazon Linux 2

[QOL-9055] fix handling of POST results

429909e

- ensure redirects are actioned, not thrown away

[QOL-9055] fix tests for POST results

b57a1a5

- expect a redirect if no validation errors

Merge pull request #71 from qld-gov-au/QOL-9055-amazon-linux-2

2ee1003

QOL-9055 fix handling of POST requests

Merge pull request #70 from qld-gov-au/develop

f2c4585

Develop to master

restore conwetlab README

ea6ba6d

replace obsolete integratedexperts container

e4a867a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

QGOV changes#59

QGOV changes#59
ThrawnCA wants to merge 339 commits intoconwetlab:masterfrom
qld-gov-au:qgov-changes

ThrawnCA commented Jul 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

ThrawnCA commented Jul 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant