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

Ensure integer sizes #269

Merged
merged 2 commits into from
Mar 9, 2017
Merged

Ensure integer sizes #269

merged 2 commits into from
Mar 9, 2017

Conversation

rkern
Copy link
Member

@rkern rkern commented Mar 8, 2017

numpy 1.12 completes the deprecation of floats as shapes. The GraphicsContext() constructor permits such floats, so we coerce internally at the last possible moment.

This also fixes the skip logic for an unrelated test so that I'd have a clean test suite.

This should fix the test failure in enthought/chaco#342 in the one Travis environment that is using numpy 1.12.

rkern added 2 commits March 8, 2017 15:37
This fixes test failures with the null backend and numpy 1.12

This also moves the monkeypatched init() to the proper place. It was
made a monkeypatch a very long time ago to work around a SWIG issue
that has long since been resolved.
@codecov-io
Copy link

codecov-io commented Mar 8, 2017

Codecov Report

Merging #269 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #269   +/-   ##
=======================================
  Coverage   35.44%   35.44%           
=======================================
  Files         205      205           
  Lines       18799    18799           
  Branches     2627     2627           
=======================================
  Hits         6664     6664           
  Misses      11700    11700           
  Partials      435      435

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 359c2f9...55e4f59. Read the comment docs.

@jwiggins
Copy link
Member

jwiggins commented Mar 9, 2017

LGTM!

@rkern rkern merged commit ea5eda1 into master Mar 9, 2017
@jwiggins jwiggins deleted the fix/ensure-integer-sizes branch March 10, 2017 10:10
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