You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/11/08 17:49:34 UTC
[1/5] libcloud git commit: Make clearer travis display
Repository: libcloud
Updated Branches:
refs/heads/trunk 71d4e5718 -> b3f5df875
Make clearer travis display
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f23063e5
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f23063e5
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f23063e5
Branch: refs/heads/trunk
Commit: f23063e5b0f6843ad0803b680d3f8d1df9c4f3dd
Parents: 71d4e57
Author: ZuluPro <mo...@hotmail.com>
Authored: Fri Sep 18 00:29:01 2015 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 8 17:04:33 2015 +0100
----------------------------------------------------------------------
.travis.yml | 24 +++++++++++++++---------
tox.ini | 12 ++++++------
2 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f23063e5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index fc756ce..bee847c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,31 @@
language: python
-python: 2.7
+python:
+ - 2.6
+ - 2.7
+ - 3.2
+ - 3.3
+ - 3.4
+ - "pypy"
sudo: false
os:
- linux
- osx
env:
- - TOX_ENV=lint
- - TOX_ENV=py26
- - TOX_ENV=py27
- - TOX_ENV=pypy
- - TOX_ENV=py32
- - TOX_ENV=py33
- - TOX_ENV=py34
- - TOX_ENV=docs
matrix:
fast_finish: true
allow_failures:
- os: osx
+ include:
+ - python: 2.7
+ env: ENV=lint
+ before_script: TOX_ENV=lint
+ - python: 2.7
+ env: ENV=docs
+ before_script: TOX_ENV=docs
install:
+ - TOX_ENV=py$TRAVIS_PYTHON_VERSION
- pip install tox
script:
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f23063e5/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 9df229a..77a7558 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py25,py26,py27,pypy,py32,py33,py34,lint
+envlist = py2.5,py2.6,py2.7,pypypy,py3.2,py3.3,py3.4,lint
setenv =
PIP_USE_MIRRORS=1
@@ -12,7 +12,7 @@ deps = -r{toxinidir}/requirements-tests.txt
commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
python setup.py test
-[testenv:py25]
+[testenv:py2.5]
setenv = PIP_INSECURE=1
deps = -r{toxinidir}/requirements-tests.txt
backports.ssl_match_hostname
@@ -22,21 +22,21 @@ deps = -r{toxinidir}/requirements-tests.txt
simplejson
paramiko
-[testenv:pypy]
+[testenv:pypypy]
deps = -r{toxinidir}/requirements-tests.txt
backports.ssl_match_hostname
unittest2
lockfile
-[testenv:py32]
+[testenv:py3.2]
deps = -r{toxinidir}/requirements-tests.txt
lockfile
-[testenv:py33]
+[testenv:py3.3]
deps = -r{toxinidir}/requirements-tests.txt
lockfile
-[testenv:py34]
+[testenv:py3.4]
# At some point we can switch to use the stdlib provided mock module on
# Python3.4+
deps = -r{toxinidir}/requirements-tests.txt
[2/5] libcloud git commit: Factorize and clean tox.ini
Posted by to...@apache.org.
Factorize and clean tox.ini
Closes #608
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/04a305aa
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/04a305aa
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/04a305aa
Branch: refs/heads/trunk
Commit: 04a305aac7c2f6386b1f3ae61102885ae11aa06f
Parents: f23063e
Author: ZuluPro <mo...@hotmail.com>
Authored: Mon Sep 21 20:36:47 2015 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 8 17:04:42 2015 +0100
----------------------------------------------------------------------
.travis.yml | 1 +
tox.ini | 57 ++++++++++++++++----------------------------------------
2 files changed, 17 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/04a305aa/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index bee847c..c48d86a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: python
+# Add or remove version for match with Travis support
python:
- 2.6
- 2.7
http://git-wip-us.apache.org/repos/asf/libcloud/blob/04a305aa/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 77a7558..0f2f6a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,52 +1,28 @@
[tox]
-envlist = py2.5,py2.6,py2.7,pypypy,py3.2,py3.3,py3.4,lint
-setenv =
- PIP_USE_MIRRORS=1
+envlist = py{2.5,2.6,2.7,pypy,3.2,3.3,3.4,3.5},lint
[testenv]
-deps = -r{toxinidir}/requirements-tests.txt
- backports.ssl_match_hostname
- unittest2
- lockfile
- paramiko
+deps =
+ -r{toxinidir}/requirements-tests.txt
+ lockfile
+ py{2.5,2.6,2.7,pypy}: paramiko
+ py{2.5,2.6}: unittest2
commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
python setup.py test
-
-[testenv:py2.5]
-setenv = PIP_INSECURE=1
-deps = -r{toxinidir}/requirements-tests.txt
- backports.ssl_match_hostname
- unittest2
- lockfile
- ssl
- simplejson
- paramiko
-
-[testenv:pypypy]
-deps = -r{toxinidir}/requirements-tests.txt
- backports.ssl_match_hostname
- unittest2
- lockfile
-
-[testenv:py3.2]
-deps = -r{toxinidir}/requirements-tests.txt
- lockfile
-
-[testenv:py3.3]
-deps = -r{toxinidir}/requirements-tests.txt
- lockfile
-
-[testenv:py3.4]
-# At some point we can switch to use the stdlib provided mock module on
-# Python3.4+
-deps = -r{toxinidir}/requirements-tests.txt
- lockfile
+basepython =
+ py2.5: python2.5
+ py2.6: python2.6
+ {py2.7,lint,pylint,docs}: python2.7
+ pypypy: pypy
+ py3.2: python3.2
+ py3.3: python3.3
+ py3.4: python3.4
+whitelist_externals = cp
[testenv:docs]
deps = sphinx
pysphere
backports.ssl_match_hostname
-basepython = python2.7
changedir = docs
commands = python ../contrib/generate_provider_feature_matrix_table.py
sphinx-apidoc -d 2 ../libcloud/ -o apidocs/
@@ -55,11 +31,10 @@ commands = python ../contrib/generate_provider_feature_matrix_table.py
[testenv:scrape-ec2-prices]
deps = requests
demjson
-basepython = python2.7
commands = python contrib/scrape-ec2-prices.py
[testenv:pylint]
-depds = pylint
+deps = pylint
backports.ssl_match_hostname
commands = pylint --rcfile=.pylintrc -E libcloud/
[4/5] libcloud git commit: Fix test failures under Python 3.5.
Posted by to...@apache.org.
Fix test failures under Python 3.5.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/787f1c62
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/787f1c62
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/787f1c62
Branch: refs/heads/trunk
Commit: 787f1c623d3b75b7ca5737829eafc54a2aeee255
Parents: ccc7b6d
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Nov 8 17:44:04 2015 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 8 17:44:04 2015 +0100
----------------------------------------------------------------------
libcloud/test/compute/test_digitalocean_v1.py | 2 +-
libcloud/test/compute/test_digitalocean_v2.py | 2 +-
libcloud/test/compute/test_ibm_sce.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/787f1c62/libcloud/test/compute/test_digitalocean_v1.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_digitalocean_v1.py b/libcloud/test/compute/test_digitalocean_v1.py
index 668e56e..5719500 100644
--- a/libcloud/test/compute/test_digitalocean_v1.py
+++ b/libcloud/test/compute/test_digitalocean_v1.py
@@ -95,7 +95,7 @@ class DigitalOcean_v1_Tests(LibcloudTestCase):
DigitalOceanMockHttp.type = 'INVALID_IMAGE'
expected_msg = \
- r'You specified an invalid image for Droplet creation. \(code: 404\)'
+ r'You specified an invalid image for Droplet creation. \(code: (404|HTTPStatus.NOT_FOUND)\)'
self.assertRaisesRegexp(Exception, expected_msg,
self.driver.create_node,
name='test', size=size, image=image,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/787f1c62/libcloud/test/compute/test_digitalocean_v2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_digitalocean_v2.py b/libcloud/test/compute/test_digitalocean_v2.py
index 03a6425..e666ce5 100644
--- a/libcloud/test/compute/test_digitalocean_v2.py
+++ b/libcloud/test/compute/test_digitalocean_v2.py
@@ -94,7 +94,7 @@ class DigitalOcean_v2_Tests(LibcloudTestCase):
DigitalOceanMockHttp.type = 'INVALID_IMAGE'
expected_msg = \
- r'You specified an invalid image for Droplet creation. \(code: 404\)'
+ r'You specified an invalid image for Droplet creation. \(code: (404|HTTPStatus.NOT_FOUND)\)'
self.assertRaisesRegexp(Exception, expected_msg,
self.driver.create_node,
name='test', size=size, image=image,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/787f1c62/libcloud/test/compute/test_ibm_sce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ibm_sce.py b/libcloud/test/compute/test_ibm_sce.py
index 55071a4..cc0beff 100644
--- a/libcloud/test/compute/test_ibm_sce.py
+++ b/libcloud/test/compute/test_ibm_sce.py
@@ -44,7 +44,7 @@ class IBMTests(unittest.TestCase, TestCaseMixin):
except InvalidCredsError:
e = sys.exc_info()[1]
self.assertTrue(isinstance(e, InvalidCredsError))
- self.assertEqual(e.value, '401: Unauthorized')
+ self.assertTrue('Unauthorized' in e.value)
else:
self.fail('test should have thrown')
[3/5] libcloud git commit: Add missing entry for python 3.5 to tox
map.
Posted by to...@apache.org.
Add missing entry for python 3.5 to tox map.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ccc7b6d0
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ccc7b6d0
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ccc7b6d0
Branch: refs/heads/trunk
Commit: ccc7b6d008366f581c02b59860c52c85eacf2b56
Parents: 04a305a
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Nov 8 17:08:19 2015 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 8 17:08:19 2015 +0100
----------------------------------------------------------------------
tox.ini | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ccc7b6d0/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 0f2f6a2..b7b9c1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,6 +17,7 @@ basepython =
py3.2: python3.2
py3.3: python3.3
py3.4: python3.4
+ py3.5: python3.5
whitelist_externals = cp
[testenv:docs]
[5/5] libcloud git commit: Also run tests under Python 3.5 on Travis.
Posted by to...@apache.org.
Also run tests under Python 3.5 on Travis.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b3f5df87
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b3f5df87
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b3f5df87
Branch: refs/heads/trunk
Commit: b3f5df8758df0395db76a9c850eab3e7324fc54c
Parents: 787f1c6
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Nov 8 17:49:00 2015 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Nov 8 17:49:00 2015 +0100
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b3f5df87/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c48d86a..e471e55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
- 3.2
- 3.3
- 3.4
+ - 3.5
- "pypy"
sudo: false
os: