diff options
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | sites/www/installing.rst | 5 | ||||
-rw-r--r-- | tox.ini | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 9a55dbb6..5f444d93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: false python: - "2.6" - "2.7" - - "3.2" - "3.3" - "3.4" install: @@ -19,9 +18,8 @@ script: # Run 'docs' first since its objects.inv is referred to by 'www'. # Also force warnings to be errors since most of them tend to be actual # problems. - # Finally, skip them under Python 3.2 due to sphinx shenanigans - - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke docs -o -W || true" - - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke www -o -W || true" + - "invoke docs -o -W || true" + - "invoke www -o -W || true" notifications: irc: channels: "irc.freenode.org#paramiko" @@ -35,7 +35,7 @@ Requirements ------------ - Python 2.6 or better <http://www.python.org/> - this includes Python - 3.2 and higher as well. + 3.3 and higher as well. - Cryptography 0.8 or better <https://cryptography.io> - pyasn1 0.1.7 or better <https://pypi.python.org/pypi/pyasn1> diff --git a/sites/www/installing.rst b/sites/www/installing.rst index 9da7c23d..1865ddfc 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -16,9 +16,8 @@ via `pip <http://pip-installer.org>`_:: Users who want the bleeding edge can install the development version via ``pip install paramiko==dev``. -We currently support **Python 2.6, 2.7, 3.3+, and PyPy** (Python **3.2** should -also work but has a less-strong compatibility guarantee from us.) Users on -Python 2.5 or older are urged to upgrade. +We currently support **Python 2.6, 2.7, 3.3+, and PyPy** Users on Python 2.5 or +older are urged to upgrade. Paramiko has two hard dependencies: the pure-Python ASN1 module ``pyasn1``, and the Cryptography library. Read on for details on installing ``cryptography``. @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py32,py33,py34,pypy +envlist = py26,py27,py33,py34,pypy [testenv] commands = pip install -q -r tox-requirements.txt |