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

Enhancements from Queensland Government fork #70

Open
wants to merge 28 commits into
base: master
Choose a base branch
from

Conversation

ThrawnCA
Copy link

@ThrawnCA ThrawnCA commented Mar 5, 2021

  • Download archive to a temporary file if not already on disk, so we can do type sniffing. This is relevant when the file uploader goes to somewhere remote like S3.
  • Use UTC timestamps internally so that times are stored correctly. They're stored in the database without timezone info, so if they were originally generated with a timezone, they'll come out wrong.
  • Enable file downloads to optionally go through a proxy.
  • Use BSD file fallback more consistently when other methods fail.
  • Clean up for Flake8 and Python 3.
  • Move dependencies into external requirements.txt instead of setup.py.

ThrawnCA and others added 26 commits March 5, 2021 13:44
- This uses the external URL without an API key, so it will not work on private datasets,
but it is otherwise fairly reliable.
…s an upload

- This appears to point to either the download URL, or the cache URL, as needed
- add Flake8 config and make it pass
- use 'six' to prepare for Python 3
- patch xlrd
- don't force versions of ckanext-archiver and ckanext-report, just verify they're present
- new minor version, because it introduces the download proxy and retrieving remote cached files as new features
- install newer setuptools if needed
- install transitive dependencies of ckanext-archiver and ckanext-report
- start to recognise Python 3
@ThrawnCA
Copy link
Author

ThrawnCA commented Mar 5, 2021

For some reason the CKAN versions aren't being respected and it's always running against master. Will look into what's needed to make it compatible with CKAN 2.9.x.

@Zharktas
Copy link
Member

Zharktas commented Mar 5, 2021

I'll probably have time in the near future to migrate QA to py3, some of these changes are probably done during that. Travis will be replaced by Github Actions, so I wouldn't use too much time maintaining travis scripts.

@ThrawnCA
Copy link
Author

ThrawnCA commented Mar 7, 2021

I'll probably have time in the near future to migrate QA to py3, some of these changes are probably done during that. Travis will be replaced by Github Actions, so I wouldn't use too much time maintaining travis scripts.

We made a start on converting to GitHub actions, and some of the resulting test fixes are in this pull request, but I wasn't able to make the last few tests pass (it was failing to determine the type of some of the sample files, for no reason I could identify, but it was consistent). I can submit our workflow if you want to review it.

- needs a bit more debugging but is close to working
@nickumia-reisys
Copy link

Hi @ThrawnCA and @Zharktas, are you guys planning on using this PR to do the PY3 and CKAN upgrades? My team (GSA/data.gov) is in the process of upgrading our applications to PY3 and CKAN 2.9 and since this is a dependency, I was curious if there were any updates on either of your ends regarding additional work here. I'd be happy to support the upgrade based on the current progress. In the coming weeks, we will be ramping up activity in this specific upgrade.

@ThrawnCA
Copy link
Author

Hi @ThrawnCA and @Zharktas, are you guys planning on using this PR to do the PY3 and CKAN upgrades?

Actually, my organisation has a fork of this extension, https://github.com/qld-gov-au/ckanext-qa, which is what we'll use for upgrading.

This PR is just backporting some of our changes to upstream.

My team (GSA/data.gov) is in the process of upgrading our applications to PY3 and CKAN 2.9 and since this is a dependency, I was curious if there were any updates on either of your ends regarding additional work here. I'd be happy to support the upgrade based on the current progress. In the coming weeks, we will be ramping up activity in this specific upgrade.

There's a project happening right now that's putting the upgrade on hold at our end, but in a few months we'll likely focus on it in earnest. Sounds like you'll probably be done by then. Probably best if you collaborate with Zharktas.

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.

None yet

4 participants