Skip to content

Commit

Permalink
Cover no-libcloud case in CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
mithrandi committed Nov 13, 2016
1 parent a90dac2 commit d347d0d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
26 changes: 14 additions & 12 deletions .travis.yml
Expand Up @@ -8,29 +8,31 @@ branches:
matrix:
include:
- python: 2.7
env: TOXENV=py27-twlatest
env: TOXENV=py27-twlatest-alldeps
- python: 3.4
env: TOXENV=py34-twlatest
env: TOXENV=py34-twlatest-alldeps
- python: 3.5
env: TOXENV=py35-twlatest
env: TOXENV=py35-twlatest-alldeps
- python: pypy
env: TOXENV=pypy-twlatest
env: TOXENV=pypy-twlatest-alldeps
- python: 2.7
env: TOXENV=py27-twtrunk
env: TOXENV=py27-twtrunk-alldeps
- python: 3.4
env: TOXENV=py34-twtrunk
env: TOXENV=py34-twtrunk-alldeps
- python: 3.5
env: TOXENV=py35-twtrunk
env: TOXENV=py35-twtrunk-alldeps
- python: pypy
env: TOXENV=pypy-twtrunk
env: TOXENV=pypy-twtrunk-alldeps
- python: 2.7
env: TOXENV=py27-twlowest
env: TOXENV=py27-twlowest-alldeps
- python: 3.4
env: TOXENV=py34-twlowest
env: TOXENV=py34-twlowest-alldeps
- python: 3.5
env: TOXENV=py35-twlowest
env: TOXENV=py35-twlowest-alldeps
- python: pypy
env: TOXENV=pypy-twlowest
env: TOXENV=pypy-twlowest-alldeps
- python: 2.7
env: TOXENV=py27-twlatest
- python: 2.7
env: TOXENV=docs
addons:
Expand Down
2 changes: 1 addition & 1 deletion requirements-doc.txt
@@ -1,4 +1,4 @@
.[test]
.[test,libcloud]
sphinx
sphinx_rtd_theme
repoze.sphinx.autointerface>=0.8
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -56,7 +56,6 @@ def read(*parts):
'apache-libcloud',
],
'test': [
'apache-libcloud',
'fixtures>=1.4.0',
'hypothesis>=3.1.0,<4.0.0',
'testrepository>=0.0.20',
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = coverage-clean,{py27,pypy,py34,py35}-{twlatest,twtrunk,twlowest},flake8,docs,coverage-report
envlist = coverage-clean,{py27,pypy,py34,py35}-{twlatest,twtrunk,twlowest}-alldeps,py27-twlatest,flake8,docs,coverage-report

[testenv]
setenv =
Expand All @@ -9,6 +9,7 @@ whitelist_externals =
mkdir
deps =
.[test]
alldeps: .[libcloud]
twlatest: Twisted[tls]
twtrunk: https://github.com/twisted/twisted/archive/trunk.zip#egg=Twisted[tls]
twlowest: Twisted[tls]==15.5.0
Expand Down Expand Up @@ -44,7 +45,6 @@ whitelist_externals =
changedir = docs
deps =
-rrequirements-doc.txt
git+https://github.com/certbot/certbot.git@master#egg=acme&subdirectory=acme
commands =
rm -rf {toxinidir}/docs/api/
sphinx-build -W -n -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

0 comments on commit d347d0d

Please sign in to comment.