Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Oct 28, 2015
Merged

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

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aea62f7
Reduce dupe between tests.py and matplotlib.test
mdboom Oct 27, 2015
0cf5dcb
Fix plugin instantiation
mdboom Oct 27, 2015
eb26fad
Install mock unconditionally
mdboom Oct 27, 2015
ee3b492
Install mock only on Python 2.7
mdboom Oct 28, 2015
e422b7f
Add mock back in for doc build
mdboom Oct 28, 2015
603bce8
Fix merge
mdboom Oct 28, 2015
a4715f9
Fix merge
mdboom Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Install mock unconditionally
  • Loading branch information
@mdboom
mdboom committed Oct 28, 2015
commit eb26fade98b26977d493cd36af098971a0272c4c
16 changes: 6 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@ matrix:
include:
- python: 2.7
env: MOCK=mock NUMPY=numpy==1.6
- python: 2.7
env: PANDAS=pandas
- python: 3.3
- python: 3.4
- python: 3.5
env: PANDAS=pandas
- python: 3.5
env: TEST_ARGS=--pep8
- python: 2.7
env: BUILD_DOCS=true MOCK=mock
env: BUILD_DOCS=true
Copy link
Member

Choose a reason for hiding this comment

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

Mock is a dependency of building the docs because we mock out PyQT4 for the api docs. Perhaps we should switch the docs build to 3.5 instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

Let me confirm if our docs are building well on Python 3.5 first (so maybe save that for another PR). Last time I tried they were really close, but I'm not certain they are 100%. In the meantime, I'll put mock back in here, too.

Copy link
Member

Choose a reason for hiding this comment

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

👍 on switching doc building to 3.5, now that you fixed the numpy related issues that was in the back of my head.

- python: "nightly"
env: PRE=--pre
allow_failures:
Expand All @@ -62,21 +65,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.

else
pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0 mock;
fi
# Always install from pypi
- pip install $PRE pep8 cycler
- 'pip install https://github.com/tacaswell/nose/zipball/mnt_py36_compat#egg=nose'

# Install mock on python 2. Python 2.6 requires mock 1.0.1
# Since later versions have dropped support
- |
if [[ -n "$MOCK" ]]; then
echo $MOCK
pip install $MOCK
fi;
# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
# version since is it basically just a .ttf file
Expand Down