Zharktas py3 to qld gov au wip #4

duttonw · 2021-02-12T05:46:34Z

may need to re-introduce items which got removed from merging zharktas's work

This reverts commit 009fa3a.

…neeidng to go back to nose tests

duttonw · 2021-02-12T05:54:48Z

ckanext/report/controllers.py

-            'are_some_results': are_some_results})
-
-
-def make_csv_from_dicts(rows):


moved to lib.py

duttonw · 2021-02-12T05:54:58Z

ckanext/report/controllers.py

-    return csvout.read()
-
-
-def ensure_data_is_dicts(data):


moved to lib.py

duttonw · 2021-02-12T05:55:06Z

ckanext/report/controllers.py

-        del data['columns']
-
-
-def anonymise_user_names(data, organization=None):


moved to lib.py

ThrawnCA · 2021-02-12T06:27:59Z

Shouldn't this go to develop rather than master?

ThrawnCA

Please change target branch to develop.

duttonw · 2021-02-12T06:33:14Z

Please change target branch to develop.

Changed

ckanext/report/helpers.py

ThrawnCA · 2021-03-03T02:15:03Z

ckanext/report/report_registry.py

-#    'name': 'feedback-report',
-#    'option_combinations': nii_report_combinations,
-#    'generate': nii_report,
+from builtins import str


This should use six

ThrawnCA

This won't currently work on Python2; it needs to use 'six' more.

- make Flake8 happy - use 'six' to improve Python 2/3 compatibility

duttonw · 2021-06-01T22:57:49Z

still have lots of tests failing, can you rebase this to develop @ThrawnCA

Zharktas added 30 commits February 12, 2021 15:44

Add travis templates

a5f992e

fix line endings

8a071d4

Add test configuration files

72cc26c

add empty requirements files

5567a17

add dev-requirements

0a08df1

add conftest.py

de0a5d9

Add test templates

b157901

Fix import of OrderedDict

cd9d238

Add blueprint and convert paste and pylons imports to toolkit

926785e

Add compatiblity table

20ca68a

Fix table syntax

691f2a3

Add route tests

d0c9725

Check if plugin is already loaded

fcb34ed

Init nosetest classes

1050779

fix parameter name

1c467e2

Fix travis core setup

3bbc640

Fix nose test

fc9d1bf

fix import

fe49285

Test assert

1ff3c9b

Add pylons/flask mixin

56d888d

Fix syntax

a9a6cba

move rule inside the view

4d3413a

Fix typo

c457caa

return blueprints

70ccdbb

remove extra parameters

d0e710f

Fix nav links

96052e6

futurize stage1

fb7bff8

Move common functions to lib

453cce2

fix imports

7b31f77

Add named_route parameter

3300665

Zharktas and others added 15 commits February 12, 2021 15:44

add future to requirements

99b592b

Add initdb to new cli interface

9f4ef87

Add tagless report test

05ebddb

Use flask in 2.9

f7e1180

unicode

d1763b0

dont concat

4e50430

fix typo

6d62ec3

Revert "fix typo"

d94a216

This reverts commit 009fa3a.

use assert_in

409f22c

use correct dataset name

22a11b8

import config from pylons in ckan 2.5

0992665

Modernize travis

47efda6

add github actions to py3 branch of Zharktas

6abc1a4

add pytest ckan_setup and fixtures patch so 2.8 and 2.9 work without …

8d96bf6

…neeidng to go back to nose tests

remove nost tests

41cd318

duttonw requested a review from ThrawnCA February 12, 2021 05:46

duttonw commented Feb 12, 2021

View reviewed changes

ckanext/report/controllers.py

'are_some_results': are_some_results})

def make_csv_from_dicts(rows):

Copy link

Member Author

duttonw Feb 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to lib.py

duttonw commented Feb 12, 2021

View reviewed changes

ckanext/report/controllers.py

return csvout.read()

def ensure_data_is_dicts(data):

Copy link

Member Author

duttonw Feb 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to lib.py

duttonw commented Feb 12, 2021

View reviewed changes

ckanext/report/controllers.py

del data['columns']

def anonymise_user_names(data, organization=None):

Copy link

Member Author

duttonw Feb 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to lib.py

ThrawnCA requested changes Feb 12, 2021

View reviewed changes

duttonw changed the base branch from master to develop February 12, 2021 06:32

ThrawnCA reviewed Mar 3, 2021

View reviewed changes

ckanext/report/helpers.py Outdated Show resolved Hide resolved

ThrawnCA reviewed Mar 3, 2021

View reviewed changes

ThrawnCA requested changes Mar 3, 2021

View reviewed changes

[QOL-7906] clean up

0b874da

- make Flake8 happy - use 'six' to improve Python 2/3 compatibility

[QOL-7906] replace 'builtins' with 'six'

00d3d0c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zharktas py3 to qld gov au wip #4

Zharktas py3 to qld gov au wip #4

duttonw commented Feb 12, 2021

duttonw Feb 12, 2021

duttonw Feb 12, 2021

duttonw Feb 12, 2021

ThrawnCA commented Feb 12, 2021

ThrawnCA left a comment

duttonw commented Feb 12, 2021

ThrawnCA Mar 3, 2021

ThrawnCA left a comment

duttonw commented Jun 1, 2021

		'are_some_results': are_some_results})


		def make_csv_from_dicts(rows):

		del data['columns']


		def anonymise_user_names(data, organization=None):

Zharktas py3 to qld gov au wip #4

Are you sure you want to change the base?

Zharktas py3 to qld gov au wip #4

Conversation

duttonw commented Feb 12, 2021

duttonw Feb 12, 2021

Choose a reason for hiding this comment

duttonw Feb 12, 2021

Choose a reason for hiding this comment

duttonw Feb 12, 2021

Choose a reason for hiding this comment

ThrawnCA commented Feb 12, 2021

ThrawnCA left a comment

Choose a reason for hiding this comment

duttonw commented Feb 12, 2021

ThrawnCA Mar 3, 2021

Choose a reason for hiding this comment

ThrawnCA left a comment

Choose a reason for hiding this comment

duttonw commented Jun 1, 2021