Backport bugfixes from master

[mdickinson]

[Note: PR is against a newly-created maint/4.6.x branch, created from the 4.6.1 release tag, with its version bumped and IS_RELEASED set to False.]

Backport commits from PRs #268, #269 and #272, in preparation for a 4.6.2 release.

[corranwebster]

Test failures are odd. Has a dependency shifted from under us?

Other than that, generally the PR looks good.

[codecov-io]

Codecov Report

Merging #273 into maint/4.6.x will increase coverage by 1.85%.
The diff coverage is 33.33%.

@@               Coverage Diff               @@
##           maint/4.6.x     #273      +/-   ##
===============================================
+ Coverage        33.84%   35.69%   +1.85%     
===============================================
  Files              210      210              
  Lines            19196    19191       -5     
  Branches          2788     2786       -2     
===============================================
+ Hits              6496     6851     +355     
+ Misses           12283    11894     -389     
- Partials           417      446      +29

Impacted Files	Coverage Δ
enable/savage/svg/backends/kiva/renderer.py	30.28% <0%> (+0.65%)	⬆️
kiva/fonttools/font_manager.py	53.95% <50%> (-0.02%)	⬇️
kiva/trait_defs/kiva_font_trait.py	82.81% <0%> (+3.12%)	⬆️
enable/component.py	55.78% <0%> (+3.3%)	⬆️
enable/component_editor.py	83.33% <0%> (+4.16%)	⬆️
enable/abstract_window.py	57.57% <0%> (+4.54%)	⬆️
enable/base.py	45.27% <0%> (+8.1%)	⬆️
enable/container.py	53.72% <0%> (+11.32%)	⬆️
enable/colors.py	43.47% <0%> (+13.04%)	⬆️
enable/qt4/scrollbar.py	76.7% <0%> (+39.77%)	⬆️
... and 3 more

---

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 c7fb14a...c0c48ab. Read the comment docs.

[corranwebster]

Also, I don't think it matters, but you are branched from the release point, not the commit where release is set to False: https://github.com/enthought/enable/blob/backport-bugfixes-from-master/setup.py#L42

[mdickinson]

but you are branched from the release point

Yep. I was following the contribution guide.

then a branch should be created from the release tag [...]

[mdickinson]

Note that #272 was also merged with CI failures; we may need to fix that upstream in master and then backport.

[corranwebster]

If I have a suspect, it would be that CI is tracking Pyface and TraitsUI master. It might make sense for the maintenance branch to track the most recent released versions.

[corranwebster]

Regarding the branch point, I would have started at c7fb14a rather than 5652a32

I think that the comment is referring to creating the maint/4.6.x branch.

[mdickinson]

I think that the comment is referring to creating the maint/4.6.x branch.

Ah, sorry; I thought that was what you were talking about, too. Yes, I should have branched from c7fb14a, and would have done if I'd thought to create c7fb14a before I started working on the backports. As you say, I think it doesn't matter, but I can recreate this PR against c7fb14a if you prefer.

[mdickinson]

It might make sense for the maintenance branch to track the most recent released versions.

Agreed, though I think it's PySide that's causing the issues with 3.4.

Opened #274 and #275 for the CI issues; those probably need to be resolved before this can move forward.

[mdickinson]

At the risk of flogging a dead horse, I originally understood your message to mean that I should have branched maint/4.6.x from 32c2a01. (Which seems like a good idea to me.)

[mdickinson]

Restarted the Travis builds: now it's only the 3.4 Qt builds that are failing.

@jwiggins: I'd like to make an Enable 4.6.2 release from this branch. Does that sound reasonable? It's mainly for an internal project that's running into the missing fonts issue fixed in #272.

[mdickinson]

I'd like to make an Enable 4.6.2 release from this branch.

Sorry, correction: I'd like to make an Enable 4.6.2 release from the release maintenance branch, not from this one.

Merging this branch, now that at least half of the CI issues are solved.