diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
| commit | b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7 (patch) | |
| tree | 389e17b0c08cd34872a2e3afbc34860ab44fb3ed /tox.ini | |
| parent | bd61c7c0a9a4a2020d0acfb6a01e9ec85bb43b8e (diff) | |
| parent | ae078f51d622931954e47e78029a889c4e721a05 (diff) | |
Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3
Conflicts:
dev-requirements.txt
paramiko/__init__.py
paramiko/file.py
paramiko/hostkeys.py
paramiko/message.py
paramiko/proxy.py
paramiko/server.py
paramiko/transport.py
paramiko/util.py
paramiko/win_pageant.py
setup.py
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ [tox] -envlist = py25,py26,py27 +envlist = py25,py26,py27,py32,py33 [testenv] commands = pip install --use-mirrors -q -r tox-requirements.txt |