Skip to content

Fix conflicts with upstream master - #5

Merged
funkey merged 11 commits into
funkey:masterfrom
jakirkham:fix_pr_87_conflicts
Nov 2, 2018
Merged

funkey merged 11 commits into
funkey:masterfrom
jakirkham:fix_pr_87_conflicts

Conversation

@jakirkham

Copy link
Copy Markdown

Fixes merge conflicts of PR ( zarr-developers#87 ) with upstream master. Should also fix the CI failure (as upstream master drops Python 3.4).

jakirkham and others added 11 commits October 31, 2018 12:52
As we have already dropped Python 3.4 support in Zarr and we are about
to add Python 3.7 support here, go ahead and drop Python 3.4 support in
Numcodecs as well.
Adds Python 3.6 to the trove classifiers. It was already supported, but
got missed in this list. So go ahead and add it.
Add this to the changelog since it is user facing. Though probably does
not effect that many users at this point.
Guessing we don't need this in the source as HTML files are not
generated for the other Cython modules, so dropping this in an effort to
tidy things up here.
Use the latest Cython to regenerate C files for distribution. These
should include support for Python 3.7 as well, which will be useful as
we add Python 3.7 support to Numcodecs generally.
…nerate_c_files

Regenerate C files with Cython 0.29
@funkey
funkey merged commit 559cd6e into funkey:master Nov 2, 2018
@jakirkham
jakirkham deleted the fix_pr_87_conflicts branch November 2, 2018 16:03
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.

2 participants