Skip to content

Commit

Permalink
CI: do not try installing pybroom on py27
Browse files Browse the repository at this point in the history
  • Loading branch information
tritemio committed Jul 19, 2017
1 parent 5ed68bb commit 794c5f0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ before_install:
- conda config --add channels conda-forge

install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip scipy pandas matplotlib lmfit cython numba phconvert pytest nbconvert ipykernel ipywidgets pybroom
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip scipy pandas matplotlib lmfit cython numba phconvert pytest nbconvert ipykernel ipywidgets
- pip install seaborn
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install pathlib ; fi
- if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install pybroom ; fi
- python setup.py build
- pip install .
- rm -rf build/
Expand Down
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ install:
- conda update -q conda
- conda info -a
- conda config --append channels conda-forge
- "conda create -q -n test-environment python=%PYTHON_VERSION% pip scipy pandas matplotlib lmfit cython numba nbconvert pytest phconvert ipykernel ipywidgets pybroom"
- "conda create -q -n test-environment python=%PYTHON_VERSION% pip scipy pandas matplotlib lmfit cython numba nbconvert pytest phconvert ipykernel ipywidgets"
- activate test-environment
- pip install seaborn
- python -m pip install --upgrade pip
- ps: 'if($env:PYTHON_VERSION -eq "2.7"){pip install pathlib}'
- ps: 'if($env:PYTHON_VERSION -ne "2.7"){pip install pybroom}'
- python --version
- cd %APPVEYOR_BUILD_FOLDER%
- dir
Expand Down

0 comments on commit 794c5f0

Please sign in to comment.