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

Fix CI #207

Merged
merged 2 commits into from
Aug 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ matrix:
- python: 3.4
env: CONF=extras.cfg EXTRAS_INSTALLED=true
install:
- python bootstrap-buildout.py --setuptools-version=18.5
- bin/buildout -c $CONF annotate
- bin/buildout -N -t 3 -c $CONF
- pip install -r requirements.txt
- buildout -c $CONF annotate
- buildout -N -t 3 -c $CONF
script:
- bin/code-analysis
- bin/test
after_success:
- bin/createcoverage run bin/test
- pip install coverage==3.7 coveralls
- bin/createcoverage -d htmlcov
- coveralls
after_failure:
- bin/flake8 --version
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Change history
`flake8_strict <https://pypi.python.org/pypi/flake8_strict>`_.
[gforcada]

- Fix Continuous Integration (Travis) by using pip to install setuptools and zc.buildout.
[gforcada]

2.2 (2016-02-20)
----------------
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ include buildout.cfg
include extras.cfg
include travis.cfg
include .isort.cfg
include requirements.txt
6 changes: 4 additions & 2 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ eggs =
zest.releaser

[versions]
# keep them in sync with requirements.txt
setuptools = 33.1.1
zc.buildout = 2.8.0

bleach = 1.4.2
chardet = 2.3.0
check-manifest = 0.27
Expand Down Expand Up @@ -103,15 +107,13 @@ readme-renderer = 0.7.0
requests = 2.8.1
requests-toolbelt = 0.4.0
restructuredtext-lint = 0.12.2
setuptools = 18.5
six = 1.10.0
testfixtures = 4.4.0
transaction = 1.2.0
twine = 1.6.4
Unidecode = 0.4.18
wheel = 0.26.0
z3c.dependencychecker = 1.15
zc.buildout = 2.5.0
zc.recipe.cmmi = 1.3.6
zc.recipe.egg = 2.0.3
zc.recipe.testrunner = 2.0.0
Expand Down
6 changes: 6 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# keep them in sync with buildout.cfg
setuptools==33.1.1
zc.buildout==2.8.0

coverage==3.7
coveralls==1.2.0