Skip to content

Commit

Permalink
Make sure removing PyQt does not uninstall Matplotlib, and set MPLBAC…
Browse files Browse the repository at this point in the history
…KEND variable
  • Loading branch information
astrofrog committed Jun 2, 2016
1 parent 33857b8 commit 525b9ec
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 120 deletions.
85 changes: 6 additions & 79 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
language: c

os:
- linux
- osx

sudo: false

addons:
Expand All @@ -15,9 +11,6 @@ notifications:
email: false

env:
matrix:
- PYTHON_VERSION=2.7 ASTROPY_VERSION=1.0
- PYTHON_VERSION=3.4 ASTROPY_VERSION=1.0
global:
- PYTEST_ARGS="--cov glue"
- MATPLOTLIB_VERSION=1.5.0
Expand All @@ -36,81 +29,14 @@ env:

matrix:

# Don't wait for allowed failures
fast_finish: true

include:

# Astropy dev
- os: linux
env:
- PYTHON_VERSION=2.7 ASTROPY_VERSION=dev

# Numpy dev
- os: linux
env:
- PYTHON_VERSION=2.7 NUMPY_VERSION=dev
# We don't test ginga with Numpy dev due to a bug in ginga
- PIP_DEPENDENCIES="pytest-cov coveralls pyavm astrodendro awscli"

# PyQt5
- os: linux
env:
- PYTHON_VERSION=2.7 NUMPY_VERSION=1.10 ASTROPY_VERSION=1.0 QT_PKG=pyqt5
# We don't test ginga with PyQt5 due to a bug in ginga with QT_API
- PIP_DEPENDENCIES="pytest-cov coveralls pyavm astrodendro awscli"

# The following configuration tests that glue functions with minimal
# dependencies. The --no-deps is to prevent scipy from getting
# installed as a pandas dependency.
- os: linux
env:
- PYTHON_VERSION=2.7
- PYTEST_ARGS="--cov glue"
- CONDA_DEPENDENCIES="pytz pyparsing cycler python-dateutil freetype libpng sip qt pip setuptools=7.0 pandas mock pbr six funcsigs matplotlib"
- CONDA_DEPENDENCIES_FLAGS='--no-deps'
- PIP_DEPENDENCIES="pytest-cov coveralls"

- os: linux
env:
- PYTHON_VERSION=2.7
- ASTROPY_VERSION=1.0
- DOC_TRIGGER=1
- APP_TRIGGER=1
- PYTEST_ARGS="--cov glue --no-optional-skip"
- NO_CFG_FILES=true

# Test with older package versions:

- os: linux
env: PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.3 ASTROPY_VERSION=0.3 NUMPY_VERSION=1.8

- os: linux
env: PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.4 ASTROPY_VERSION=0.4 NUMPY_VERSION=1.9 IPYTHON_VERSION=1.1

- os: linux
env: PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.4 ASTROPY_VERSION=0.4 NUMPY_VERSION=1.9 IPYTHON_VERSION=0.13

# Test with PySide, but due to segmentation faults, mark as an
# allowed failure.
- os: linux
env: PYTHON_VERSION=2.7 ASTROPY_VERSION=1.0 QT_PKG=pyside

# Test without any Qt installation, which will also cause all qt
# sub-directories to be removed, to make sure that no non-Qt code has
# any dependence on Qt code.
- os: linux
env: PYTHON_VERSION=2.7 ASTROPY_VERSION=1.0 QT_PKG=False

allow_failures:

- os: linux
env:
- PYTHON_VERSION=2.7 NUMPY_VERSION=dev
- PIP_DEPENDENCIES="pytest-cov coveralls pyavm astrodendro awscli"

- os: linux
env: PYTHON_VERSION=2.7 ASTROPY_VERSION=1.0 QT_PKG=pyside

before_install:

Expand Down Expand Up @@ -155,13 +81,14 @@ install:
# Uninstall any version of Qt if QT_PKG is False, and remove all qt
# sub-directories
- if [[ $QT_PKG == False ]]; then
conda remove --no-pin pyqt || true;
conda remove --no-pin pyside || true;
conda remove --no-pin pyqt5 || true;
conda remove --no-pin qt || true;
conda remove --no-pin qt5 || true;
conda remove --no-pin --force pyqt || true;
conda remove --no-pin --force pyside || true;
conda remove --no-pin --force pyqt5 || true;
conda remove --no-pin --force qt || true;
conda remove --no-pin --force qt5 || true;
find . -name "qt" -type d -exec rm -r {} \; || true;
rm glue/external/qt.py || true;
export MPLBACKEND='Agg'
fi

# We need to install glue in order to make sure that the entry points are
Expand Down
41 changes: 0 additions & 41 deletions appveyor.yml

This file was deleted.

0 comments on commit 525b9ec

Please sign in to comment.