Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introducing custom pip install in tox to be used with cached wheels. #301

Merged
merged 3 commits into from
Oct 28, 2014
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
language: python
# command to install dependencies

install:
- pip install tox
- pip install coveralls
# run tests
- scripts/custom_pip_install.sh tox

script:
- tox -e py26
- tox -e py27
- tox -e lint
- tox -e regression
after_success:
- tox -e cover
- coveralls
- scripts/update_docs.sh
after_success:
- tox -e coveralls
4 changes: 4 additions & 0 deletions scripts/custom_pip_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
# Temporarily perform default pip install before initial
# wheelhouse is built.
pip install "$@"
28 changes: 24 additions & 4 deletions scripts/update_docs.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
#!/bin/bash

# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -ev

# If merging to master and not a pull request, update docs.
if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
if [[ "${TRAVIS_BRANCH}" == "master" ]] && \
[[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
# Generate new set of json files in docs/json/master.

This comment was marked as spam.

This comment was marked as spam.

tox -e docs
git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} ghpages
git submodule add -b gh-pages \
"https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME}" \
ghpages
cp -R docs/_build/html/* ghpages/
cd ghpages
git add .
# Commit to gh-pages branch to apply changes.
git config user.name "selfiebot"
git commit -m "Update docs after merge to master."
git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages
git push \
"https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME}" \
HEAD:gh-pages
else
echo "Not in master on a non-pull request. Doing nothing."
fi
14 changes: 12 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ deps =
protobuf==2.6.0

[testenv]
install_command =
{toxinidir}/scripts/custom_pip_install.sh {opts} {packages}
commands =
nosetests
deps =
Expand All @@ -21,14 +23,22 @@ deps =
basepython =
python2.7
commands =
nosetests --with-xunit --with-xcoverage --cover-package=gcloud \
--nocapture --cover-erase --cover-tests --cover-branches
nosetests --with-xunit --with-xcoverage --cover-package=gcloud --nocapture --cover-erase --cover-tests --cover-branches
deps =
nose
unittest2
coverage
nosexcover

[testenv:coveralls]
basepython = {[testenv:cover]basepython}
commands =
{[testenv:cover]commands}
coveralls
deps =
{[testenv:cover]deps}
coveralls

[testenv:docs]
basepython =
python2.7
Expand Down