Skip to content

Commit

Permalink
Drop support for Python 2.6
Browse files Browse the repository at this point in the history
Because the Azure driver has since dropped support and this was making
test failures noisy.

As a bonus, test failures resulting from skew in the semantics of
exceptions in "pytest.raises") go away.
  • Loading branch information
fdr committed Jun 7, 2015
1 parent d84ff02 commit 808b908
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 20 deletions.
15 changes: 6 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ is appropriate for the store you are using.
Dependencies
------------

* python (>= 2.6)
* python (>= 2.7)
* lzop
* psql (>= 8.4)
* pv
Expand Down Expand Up @@ -640,15 +640,12 @@ the tox_ configuration included with WAL-E.

To run the tests, one need only run::

$ tox

However, if one does not have both Python 2.6 and 2.7 installed
simultaneously (WAL-E supports both and tests both), there will be
errors in running tox_ as seen previously. One can restrict the test
to the Python of one's choice to avoid that::

$ tox -e py27

There are a variety of other environments tested by ``tox`` handling
old and new library versions, but ``-e py27`` is normally the
environment one should iterate with.

To run a somewhat more lengthy suite of integration tests that
communicate with AWS S3, one might run tox_ like this::

Expand All @@ -658,7 +655,7 @@ communicate with AWS S3, one might run tox_ like this::
WALE_WABS_INTEGRATION_TESTS=TRUE \
WABS_ACCOUNT_NAME=[...] \
WABS_ACCESS_KEY=[...] \
tox -- -n 8
tox -e py27 -- -n 8

Looking carefully at the above, notice the ``-n 8`` added the tox_
invocation. This ``-n 8`` is after a ``--`` that indicates to tox_
Expand Down
12 changes: 1 addition & 11 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
[tox]
skipsdist=True

[testenv:py26]
basepython = python2.6

[testenv:py27]
basepython = python2.7

# Oldest sensitive dependencies supported with WAL-E 0.7.
[testenv:0.8-oldest]
basepython = python2.6
basepython = python2.7
deps =
boto==2.6.0
azure==0.7.0
Expand All @@ -19,13 +16,6 @@ deps =
python-daemon==1.5.2
{[base]deps}

# Test new botos, by request of boto maintainer Daniel G. Taylor.
[testenv:boto-tip-2.6]
basepython = python2.6
deps =
git+git://github.com/boto/boto.git#egg=boto
{[base]deps}

[testenv:boto-tip-2.7]
basepython = python2.7
deps =
Expand Down

0 comments on commit 808b908

Please sign in to comment.