Commit Graph

9 Commits

Author SHA1 Message Date
Scott Maxwell b9e62182e5 Merge remote-tracking branch 'master/master' into py3-support-without-py25
Conflicts:
	paramiko/__init__.py
	setup.py
	tests/test_client.py
2014-01-16 19:50:53 -08:00
Jeff Forcier c695a931ff Update travis settings to be similar to fab's 2013-12-31 19:24:10 -08:00
Jeff Forcier 91a8066686 No more Python 2.5 on Travis :( 2013-12-31 19:14:36 -08:00
Scott Maxwell 103d056a77 Remove Python 2.5 from travis and fix minimum required version in init and README 2013-11-19 12:08:13 -08:00
Scott Maxwell e5822c9fa1 Add Py3.2 and Py3.3 to travis 2013-10-30 16:02:01 -07:00
Jeff Forcier 152f126869 Use verbose test output for travis 2013-09-27 20:09:41 -07:00
Jeff Forcier 7255dcf042 Update Travis settings:
* Don't email me, I'll see it on IRC if I'm online
* Ping #paramiko, not #fabric, as it now exists
2012-11-29 15:37:22 -08:00
Jeff Forcier a32addcfb7 Tweak travis config 2012-11-06 13:13:00 -08:00
Jeff Forcier f8bb0433a2 Travis integration
(cherry picked from commit 4cb9fed74bbde4730d2901dde4adb7cb47ae796a)
2012-09-24 18:59:39 -07:00