X Tutup
Skip to content

Merge v2.x#7838

Merged
QuLogic merged 18 commits intomasterfrom
merge-v2.x
Jan 16, 2017
Merged

Merge v2.x#7838
QuLogic merged 18 commits intomasterfrom
merge-v2.x

Conversation

@QuLogic
Copy link
Copy Markdown
Member

@QuLogic QuLogic commented Jan 15, 2017

There's a couple conflicts with .travis.yml, so just run it to be sure it's merged correctly.

dopplershift and others added 17 commits January 9, 2017 23:33
By default, don't include tests in binary distributions.
Update to include details about how to re-enable.
Closes #7715

This ensures that on python2 the values passed into `check_output` or
`Popen` are bytes.  If they are passed in as unicode (due to
unicode_literals at the top of most of our files) they will cause an
exception when there is a path in PATH that has non-ascii values.  The
reason is that when locating possible executable our input (as
unicode) is concatenated with the non-ascii path (as bytes) which then
fails to encode as ascii and raises.

The other two places we currently use `check_output` (setupext.py and
tools/github_stats.py) we do not need this handling as we do not
import unicode_iterals in those files.
Without this change, zooming in from ticks separated by
days to ticks separated by multiples of hours leaves tick
labels with no date information, even when the time period
covers several days.

With the change there is a systematic progression from one
level to the next, dropping the largest unit and adding a
smaller unit.
BUG: fix checkout_output with non-ascii paths in PATH
STY: fix poor date-time format defaults
As part of scaling dashes with linewidth, unscaled versions of
the dash pattern are now tracked.  Make sure we copy these as well.
To prevent double-scaling of the pattern in the legend

Closes #7814
Give correct name for toolkits_tests parameter to set in setup.cfg.
DOC: fix name of toolkit test in API doc
@QuLogic QuLogic added this to the 2.1 (next point release) milestone Jan 15, 2017
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Jan 15, 2017

I just realized that, as I pushed this here, I can just wait for the build on the branch. Therefore, I'm going to cancel the PR-related builds to free up CI a bit.

@QuLogic QuLogic closed this Jan 16, 2017
@QuLogic QuLogic deleted the merge-v2.x branch January 16, 2017 00:43
@QuLogic QuLogic merged commit a495675 into master Jan 16, 2017
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Jan 16, 2017

Travis is good, so in it goes...

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.

6 participants

X Tutup