diff --git a/.travis.yml b/.travis.yml index a6fc5f46dca3829dcc783b3d88ab77648eb916ff..1c90cea60547bf8e2f375e7a7f0d43acc3c97764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,16 @@ --- language: python -python: ["2.7", "3.3", "3.4", "3.5"] +python: ["2.7", "3.2", "3.3", "3.4", "3.5"] dist: trusty sudo: false cache: - pip +matrix: + allow_failure: + - python: "3.2" install: - - pip install tox-travis + - pip install tox-travis script: - tox diff --git a/README.rst b/README.rst index 19293ab61cc3652d2bef30c95559a7c2bc88cd5f..26b35817c605cec88b648cbb3bef24f6bdb9e752 100644 --- a/README.rst +++ b/README.rst @@ -51,15 +51,16 @@ Example usage can be seen in :code:`tests.sh`. Testing ------- -Local tests require both a Python 2, Python 3 and Tox installed and can be run -by running :code:`tox`. Alternatively, Travis CI is used to test on multiple -versions of Python for every push. +Tests require Python 2.7, Python 3.2 or later and Tox and are run by running +:code:`tox`. Also, Travis CI is used to test on multiple Python versions for +every push. Release ------- -Currently releases are done locally by running :code:`tox -e release` and -require Python and Tox installed. Releases with Travis CI are coming. +Releases require Python 2.7 or Python 3.2 or later and Tox. To release a new +version bump the version in the :code:`VERSION` file and run :code:`tox -e +release`. License ------- diff --git a/tox.ini b/tox.ini index c1b9865a58b02fbac3790291c3eca13be6b87662..ab86304e8a82c503e9937d09e25c4baf70b99c68 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,6 @@ deps = twine wheel commands = - sh -c 'git tag -f "$(cat VERSION)"' + sh -c 'git tag "$(cat VERSION)" && git push --tags' python setup.py bdist_wheel twine upload --skip-existing dist/*.whl