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

MRG: Omit 2.6, fix image_tester deprecation #1353

Merged
merged 22 commits into from
Sep 8, 2017
Merged

Conversation

larsoner
Copy link
Member

@larsoner larsoner commented Sep 7, 2017

I saw this log and thought it could be cleaned up a bit. Hopefully this does it.

Closes #1020.

@kmuehlbauer
Copy link
Contributor

@larsoner Somehow the bundled six doesn't get picked up and I can't immediately see why. 😢

@larsoner larsoner added this to the 0.5 milestone Sep 7, 2017
@larsoner larsoner changed the title FIX: Omit 2.6, fix image_tester deprecation MRG: Omit 2.6, fix image_tester deprecation Sep 7, 2017
@larsoner
Copy link
Member Author

larsoner commented Sep 7, 2017

Lots of CI fixes in this one. Ready for review/merge from my end. No need to look at vispy/ext/_bundled/* file changes because they are just copy-paste updates.

@larsoner
Copy link
Member Author

larsoner commented Sep 7, 2017

(This drops 2.6 support and adds 3.6 support BTW.)

with TestingCanvas() as c:
if os.getenv('TRAVIS', 'false') == 'true' and \
c.app.backend_name == 'pyqt4':
# TODO: Fix this (issue #1042
Copy link
Contributor

Choose a reason for hiding this comment

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

#1042 mentioned python26. Is this still an issue?

@kmuehlbauer
Copy link
Contributor

@larsoner First of all, great work!

I tried to follow all your of changes. I didn't catch any obvious while going through the changed files.

What I found so far in the travis runs:

I didn't look into appveyor yet.

@kmuehlbauer
Copy link
Contributor

@larsoner Do you know what is needed to get backends (eg. qt5) tested in python 3.6? Or what holds us from doing so?

@larsoner
Copy link
Member Author

larsoner commented Sep 8, 2017

Qt5 wouldn't even create a context on Linux, so it will probably be a pain -- see #960

That OSMesa I compiled a long time ago so it might need some updating, not sure.

The deprecation stuff we should deal with separately, it will require refactoring our testing code. I'll try to fix the Flake stuff, though, that should run.

@astrofrog
Copy link
Contributor

Qt5 from the defaults channel doesn't yet support OpenGL: ContinuumIO/anaconda-issues#1267

But the version from conda-forge does, so could use that channel?

@larsoner
Copy link
Member Author

larsoner commented Sep 8, 2017

Perhaps, but let's do it in another PR :)

@larsoner
Copy link
Member Author

larsoner commented Sep 8, 2017

Flake8 should be fixed. I don't think this fixes everything but it at least improves the situation and gets more testing done. @astrofrog @kmuehlbauer okay to merge once the CIs are happy?

@kmuehlbauer
Copy link
Contributor

@larsoner Yes, sure go ahead. But we should not forget the other issues (eg. osmesa). BTW @astrofrog @davidh-ssec do you know, if we can utilise osmesa from conda-forge (mesalib)?

@larsoner larsoner merged commit 6ed4d92 into vispy:master Sep 8, 2017
@larsoner larsoner deleted the cis branch September 8, 2017 20:53
@kmuehlbauer kmuehlbauer mentioned this pull request Feb 4, 2019
10 tasks
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.

3 participants