Skip to content

Commit

Permalink
Fix missing pip issue on travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Doruk Ozturk committed Dec 4, 2017
1 parent 5d42200 commit 951f660
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ initialize-venv: &initialize-venv
publish-prerelease-on-github: &publish-prerelease-on-github
name: Publish wheel and source distribution on github
command: |
if [ "${CIRCLE_BRANCH}" == "dev" ]; then
if [[ "${CIRCLE_BRANCH}" == "dev" && "${PUBLISH_RELEASE}" == "true" ]]; then
. ../venv/bin/activate
pip install -U scikit-ci-addons
ci_addons publish_github_release NeurodataWithoutBorders/pynwb \
Expand Down Expand Up @@ -94,6 +94,7 @@ jobs:
- TEST_TOX_ENV: "py36"
- COVERAGE_TOX_ENV: "coverage-py36"
- BUILD_TOX_ENV: "build-py36"
- PUBLISH_RELEASE: "true"
<<: *ci-steps

workflows:
Expand Down
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ matrix:
- TEST_TOX_ENV=py35
- COVERAGE_TOX_ENV=coverage-py35
- BUILD_TOX_ENV=build-py35

- os: osx
language: generic
env:
Expand All @@ -38,15 +39,10 @@ cache:
- $HOME/.pyenv/versions/2.7.14

before_install:
- pip install -U scikit-ci-addons
- ci_addons --install ../addons
- export PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
- python ../addons/travis/install_pyenv.py
- export PATH=$HOME/.pyenv/versions/$TRAVIS_PYTHON_VERSION/bin:$PATH
- pyenv install -s $TRAVIS_PYTHON_VERSION
- pyenv global $TRAVIS_PYTHON_VERSION

install:
- pip install tox-travis tox-pyenv

script:
- tox -e $TEST_TOX_ENV
- tox -e $COVERAGE_TOX_ENV
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ flake8==3.5.0
idna==2.6
linecache2==1.0.0
mccabe==0.6.1
pluggy==0.5.2
pluggy==0.6.0
py==1.5.2
pycodestyle==2.3.1
pyflakes==1.6.0
Expand Down

0 comments on commit 951f660

Please sign in to comment.