Skip to content

Commit

Permalink
Try to fix Mac OS X builds on Travis CI*
Browse files Browse the repository at this point in the history
(I'm wondering whether an up to date pip will use a binary
 wheel where pip-accel might rather compile from source)
  • Loading branch information
xolox committed Dec 15, 2017
1 parent 055531f commit 8c1bb23
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ matrix:
- os: osx
language: generic
install:
- scripts/travis.sh pip install pip-accel
- scripts/travis.sh pip-accel install coveralls
- scripts/travis.sh pip-accel install --requirement=requirements-checks.txt
- scripts/travis.sh pip-accel install --requirement=requirements-tests.txt
- scripts/travis.sh pip install coveralls
- scripts/travis.sh pip install --requirement=requirements-checks.txt
- scripts/travis.sh pip install --requirement=requirements-tests.txt
- scripts/travis.sh LC_ALL=C pip install .
# The `make test' command below is run under `sudo -E' to enable
# the test suite to read /var/log/syslog on Travis CI workers.
Expand Down
13 changes: 6 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile for the `coloredlogs' package.
#
# Author: Peter Odding <peter@peterodding.com>
# Last Change: November 1, 2016
# Last Change: December 15, 2017
# URL: https://coloredlogs.readthedocs.io

WORKON_HOME ?= $(HOME)/.virtualenvs
Expand Down Expand Up @@ -29,8 +29,7 @@ install:
@test -d "$(VIRTUAL_ENV)" || mkdir -p "$(VIRTUAL_ENV)"
@test -x "$(VIRTUAL_ENV)/bin/python" || virtualenv --quiet "$(VIRTUAL_ENV)"
@test -x "$(VIRTUAL_ENV)/bin/pip" || easy_install pip
@test -x "$(VIRTUAL_ENV)/bin/pip-accel" || pip install --quiet pip-accel
@pip-accel install --quiet --requirement=requirements.txt
@pip install --quiet --requirement=requirements.txt
@pip uninstall --yes coloredlogs &>/dev/null || true
@pip install --quiet --no-deps --ignore-installed .

Expand All @@ -43,21 +42,21 @@ check: install
@scripts/check-code-style.sh

test: install
@pip-accel install --quiet --requirement=requirements-tests.txt
@pip install --quiet --requirement=requirements-tests.txt
@py.test --cov --cov-report=html --no-cov-on-fail
@coverage report --fail-under=90

tox: install
@pip-accel install --quiet tox && tox
@pip install --quiet tox && tox

docs: install
@pip-accel install --quiet sphinx
@pip install --quiet sphinx
@cd docs && sphinx-build -nb html -d build/doctrees . build/html

publish: install
git push origin && git push --tags origin
$(MAKE) clean
pip-accel install --quiet twine wheel
pip install --quiet twine wheel
python setup.py sdist bdist_wheel
twine upload dist/*
$(MAKE) clean
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-code-style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

if python -c 'import sys; sys.exit(0 if sys.version_info[:2] >= (2, 7) else 1)'; then
echo "Updating installation of flake8 .." >&2
pip-accel install --upgrade --quiet --requirement=requirements-checks.txt
pip install --upgrade --quiet --requirement=requirements-checks.txt
flake8
else
echo "Skipping code style checks on Python 2.6 .." >&2
Expand Down

0 comments on commit 8c1bb23

Please sign in to comment.