Skip to content

Commit

Permalink
Testing: Fix error in Appveyor and don't run ciocheck in CircleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed May 5, 2017
1 parent 450f65e commit e4f7179
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ install:
- "powershell ci-helpers/appveyor/install-miniconda.ps1"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "activate test"
- "python setup.py install"

# Not a .NET project, we build in the install step instead
build: false
Expand Down
7 changes: 1 addition & 6 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@ dependencies:
source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh &&
export PATH="$HOME/miniconda/bin:$PATH" &&
source activate test &&
conda install -q ciocheck -c spyder-ide &&
python setup.py install;

test:
override:
# Check style
- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck qtpy: # note the colon
parallel: true
# Check PyQt5
- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install -q qt=5.* pyqt=5.* && python qtpy/tests/runtests.py: # note the colon
parallel: true
Expand All @@ -43,4 +38,4 @@ test:
parallel: true
# Check Pyside
- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda remove -q qt pyqt && conda install -c conda-forge qt=4.* pyside && python qtpy/tests/runtests.py: # note the colon
# parallel: true
parallel: true

0 comments on commit e4f7179

Please sign in to comment.