Skip to content

Commit

Permalink
Attempting to fix TravisCI issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 10, 2019
1 parent 33e44e9 commit 430293f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ matrix:
- os: linux
language: generic
env:
- PYTHON_VERSION="2.7" DISPLAY_AVAIL="YES" NUMPY_VERSION=1.15.*
- PYTHON_VERSION="2.7" NUMPY_VERSION=1.15.* COVERALLS="YES"
- os: linux
language: generic
env:
- PYTHON_VERSION="3.6" BUILD_DOCS="YES" DISPLAY_AVAIL="YES" COVERALLS="YES" NUMPY_VERSION=1.15.*
- PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15.*
before_install:
- source ci/install.sh
install:
Expand Down
4 changes: 2 additions & 2 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ source activate test-environment
pip install --upgrade pip
conda install -c conda-forge -q pytest-cov
if [[ "$COVERALLS" == "YES" ]]; then
conda install -c conda-forge -q coveralls
conda install -c conda-forge -q matplotlib
echo "Installing coveralls, matplotlib, and pyside ..."
conda install -c conda-forge -q coveralls matplotlib pyside
fi

# If we're building on OSX, we need to download python.app to get around the qt_menu.nib problem.
Expand Down
4 changes: 2 additions & 2 deletions sharppy/tests/test_binary.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import os
import sys
import pytest
import runsharp.full_gui as full_gui
#from runsharp import full_gui
#import runsharp.full_gui as full_gui
from runsharp import full_gui

@pytest.mark.skipif("DISPLAY_AVAIL" in os.environ and os.environ["DISPLAY_AVAIL"] == 'NO', reason="DISPLAY not set")
def test_main_entry_pt():
Expand Down

0 comments on commit 430293f

Please sign in to comment.