Skip to content

Commit

Permalink
Testing: Run our tests in Python 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Mar 5, 2017
1 parent 4a1a509 commit 062ca46
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
5 changes: 1 addition & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
machine:
environment:
# Python versions to tests (Maximum of 4 different versions)
PY_VERSIONS: "2.7 3.4 3.5"
PY_VERSIONS: "2.7 3.5 3.6"
# For Coveralls
COVERALLS_REPO_TOKEN: yt7YToGxRtnAcM6kSULoiCmOPetq10TaU
# Environment variables used by astropy helpers
Expand Down Expand Up @@ -45,6 +45,3 @@ test:
# PyQt4
- ./continuous_integration/circle/test-qt4.sh: # note the colon
parallel: true
# Coveralls
- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && coveralls: # note the colon
parallel: true
11 changes: 9 additions & 2 deletions continuous_integration/circle/test-qt4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ export PATH="$HOME/miniconda/bin:$PATH"

source activate test

conda install -q qt=4.* pyqt=4.*
# Only run tests for PyQt4 in Python 2.7 and 3.5
export PY_VERSIONS=($PY_VERSIONS)
export PY_VERSION=${PY_VERSIONS[$CIRCLE_NODE_INDEX]}

python runtests.py
if [ "$PY_VERSION" = "2.7" ] || [ "$PY_VERSION" = "3.5" ]; then
conda install -q qt=4.* pyqt=4.*
python runtests.py
else
exit 0
fi
4 changes: 4 additions & 0 deletions continuous_integration/circle/test-qt5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ source activate test
conda install -q qt=5.* pyqt=5.* qtconsole matplotlib

python runtests.py

# Run coveralls also here because there are errors if run
# as an independent command
coveralls

0 comments on commit 062ca46

Please sign in to comment.