Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/py3 py2 conditional #100

Merged
merged 67 commits into from
Jul 9, 2021
Merged

Feature/py3 py2 conditional #100

merged 67 commits into from
Jul 9, 2021

Conversation

nickumia-reisys
Copy link

This pull request completes the PY3 upgrade for the ckanext-datajson extension. All tests work locally. The Github Actions don't are not running correctly, @jbrown-xentity or @FuhuXia, please look to see if you see any glaring errors. The file has not been changed since it ran successfully here.

There is one dependency to successfuly merge this PR. The test_export test could not be implemented properly due to a change in the way that ckan.tests.helpers implemented their CKANTestApp class. The issue has been documented ckan/ckan#6225. But, in order to keep the upgrades moving, the test was decided to be re-written in a new way.

Acceptance of this pull request is conditional on,

  1. Tests passing on Github Actions
  2. Implementation of Test Export on Inventory-app

FuhuXia and others added 30 commits May 11, 2021 17:02
Support development and testing using CKAN_VERSION make variable. Move existing
legacy nose tests to docker-compose.legacy.yml and update make targets to
support it.
New CI tests for CKAN 2.8 and 2.9
also combined test-inventory/test_export.py in to /tests
$ pip install futurize
$ futurize --both-stages --write ckanext
Clean up various test and configuration options
otherwise it used root and gives error
somehow this is not working for us
config['ckanext.datajson.inventory_links_enabled'] = "True"
…kan/ckan/blob/2.9/ckan/lib/base.py); response doesn't seem to exist in ckan.plugins.toolkit, so import it from pylons again?
…t new version of 'response' to handle 'zip' files
…rly; updated Makefile to point to the correct docker-compose.yml file
…was necessary; updated SQLAlchemy library calls in get_packages(..) because the package organization changed from 1.1.11 to 1.3.5
@github-actions
Copy link

github-actions bot commented Jul 3, 2021

✅ Result of Pytest Coverage

---------- coverage: platform linux, python 3.8.10-final-0 -----------

Name Stmts Miss Cover
ckanext/datajson/init.py 6 6 0%
ckanext/datajson/blueprint.py 213 171 20%
ckanext/datajson/build_datajson.py 0 0 100%
ckanext/datajson/datajson_ckan_28.py 424 122 71%
ckanext/datajson/datajsonvalidator.py 224 224 0%
ckanext/datajson/exceptions.py 2 0 100%
ckanext/datajson/harvester_base.py 3 0 100%
ckanext/datajson/harvester_cmsdatanavigator.py 63 63 0%
ckanext/datajson/harvester_datajson.py 49 13 73%
ckanext/datajson/helpers.py 117 77 34%
ckanext/datajson/package2pod.py 326 271 17%
ckanext/datajson/parse_datajson.py 105 32 70%
ckanext/datajson/plugin.py 27 1 96%
TOTAL 1559 980 37%
Required test coverage of
================== 22 passed, 2886

@mogul mogul merged commit f49fb17 into main Jul 9, 2021
@mogul mogul deleted the feature/py3-py2-conditional branch July 9, 2021 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants