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

Reduce dupe between tests.py and matplotlib.test #5330

Merged
merged 7 commits into from Oct 28, 2015

Conversation

mdboom
Copy link
Member

@mdboom mdboom commented Oct 27, 2015

Fix #5328

@@ -64,21 +64,14 @@ install:
pip install --upgrade setuptools
# Install only from travis wheelhouse
- if [ -z "$PRE" ]; then
wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0;
wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0 mock;
Copy link
Member

Choose a reason for hiding this comment

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

mock shouldn't be necessary on Python 3, unless we're using something really new from 3.5.

Copy link
Member

Choose a reason for hiding this comment

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

However, it appears all imports prefer the Python 3 location, so this should be harmless.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah -- I thought it simplest to just always do it.

@tacaswell tacaswell added this to the next bug fix release (2.0.1) milestone Oct 28, 2015
@mdboom
Copy link
Member Author

mdboom commented Oct 28, 2015

#5338 builds the docs on Python 3.5

@tacaswell
Copy link
Member

pep8 is also run on 2.7. That one seems safe to just flip to 3.5 now as well.

@mdboom mdboom force-pushed the reduce-testing-duplication branch 2 times, most recently from 606ccb9 to f9e7255 Compare October 28, 2015 15:12
tacaswell added a commit that referenced this pull request Oct 28, 2015
TST: Reduce dupe between tests.py and matplotlib.test
@tacaswell tacaswell merged commit 0b4a897 into matplotlib:master Oct 28, 2015
@mdboom mdboom deleted the reduce-testing-duplication branch November 10, 2015 02:46
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Oct 16, 2016
…tion

TST: Reduce dupe between tests.py and matplotlib.test

 Conflicts:
	.travis.yml
@QuLogic QuLogic mentioned this pull request Oct 16, 2016
@QuLogic
Copy link
Member

QuLogic commented Oct 16, 2016

Backported to v2.x via f9cb9cf.

@QuLogic QuLogic modified the milestones: 2.0.1 (next bug fix release), 2.0 (style change major release) Dec 7, 2016
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.

None yet

4 participants