You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/01/09 04:52:48 UTC
[28/51] [abbrv] libcloud git commit: flexible requests
flexible requests
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a5d57c4b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a5d57c4b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a5d57c4b
Branch: refs/heads/trunk
Commit: a5d57c4b55fe86e897b35cd26ead2317fdcc6c7b
Parents: aa4dbde
Author: Anthony Shaw <an...@apache.org>
Authored: Wed Jan 4 15:20:04 2017 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Wed Jan 4 15:20:04 2017 +1100
----------------------------------------------------------------------
requirements-tests.txt | 2 +-
tox.ini | 12 +++---------
2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a5d57c4b/requirements-tests.txt
----------------------------------------------------------------------
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 0fb1567..35db592 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -5,5 +5,5 @@ pylint>=1.5.5,<1.6
mock>=1.0.1,<1.1
coveralls
coverage<4.0
-requests<=1.12.4
+requests
requests_mock
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a5d57c4b/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index f15aec3..0ee0ff6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
[tox]
-envlist = py{2.5,2.6,2.7,pypy,pypy3,3.3,3.4,3.5,3.6},lint,pylint
+envlist = py{2.6,2.7,pypy,pypy3,3.3,3.4,3.5,3.6},lint,pylint
[testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
deps =
-r{toxinidir}/requirements-tests.txt
lockfile
- py{2.5,2.6,2.7}: paramiko
- py{2.5,2.6}: unittest2
+ py{2.6,2.7}: paramiko
+ py{2.6}: unittest2
set-env =
COVERALLS_REPO_TOKEN = GAB5ZuovdsVEFxSIyZE8YhDYU886iGW54
commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
@@ -15,7 +15,6 @@ commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
# coverage run --source=libcloud setup.py test
# coveralls
basepython =
- py2.5: python2.5
py2.6: python2.6
{py2.7,lint,pylint,docs}: python2.7
pypypy: pypy
@@ -29,11 +28,6 @@ whitelist_externals = cp
# Explicitly spell out all environments to test with builtin xml and lxml,
# as it seems I can't use the following:
# [testenv:py{2.5,2.6,2.7,pypy,pypy3,3.2,3.3,3.4,3.5,3.6}-lxml]
-[testenv:py2.5-lxml]
-deps = -r{toxinidir}/requirements-tests.txt
- unittest2
- paramiko
- lxml
[testenv:py2.6-lxml]
deps = -r{toxinidir}/requirements-tests.txt
unittest2