Commit Graph

5 Commits

Author SHA1 Message Date
Jeff Forcier b2be63ec62 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
2014-03-05 17:03:37 -08:00
Jeff Forcier 7d56ecb1a7 Meta prep work (reqs.txt, tasks.py) 2014-01-21 16:15:30 -08:00
Scott Maxwell 8edd2cc75e Add Py3.2 and Py3.3 to tox 2013-10-30 16:06:09 -07:00
Jeff Forcier 4ee577abc5 Move reqs.txt to dev-reqs.txt, solidify tox req 2013-06-26 09:02:48 -07:00
Lincoln de Sousa 79dffacf4e Adding tox info (and a requirements file) 2012-11-06 18:02:10 -05:00