Commit Graph

86 Commits

Author SHA1 Message Date
Jeff Forcier 2af6081eaf Forgot python 2.5 2014-03-21 11:21:17 -07:00
Jeff Forcier 695527c9ee Indent/order shuffle, no actionable changes 2014-03-21 11:09:31 -07:00
Jeff Forcier 233f53bb37 Backport alex/patch-2, Python trove classifiers 2014-03-21 11:06:15 -07:00
Jeff Forcier c538a00012 Merge branch '1.10' into 1.11.
Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
2014-03-13 21:27:46 -07:00
Jeff Forcier 4fdb4b5ae5 Cut 1.10.7 2014-03-13 21:25:44 -07:00
Jeff Forcier 4a5f007c02 Cut 1.11.4 2014-02-14 09:38:14 -08:00
Jeff Forcier 457a34f55b Cut 1.10.6 2014-02-14 09:36:33 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier 96fdefbcb9 Merge branch '1.10' into 1.11
Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
2013-09-27 22:00:32 -07:00
Jeff Forcier f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 07e61c3552 Merge branch '1.10' into 1.11 2013-09-27 21:29:56 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files
Conflicts:
	paramiko/proxy.py
2013-09-27 21:29:18 -07:00
Jeff Forcier 2de0784d4e Versions: hard? 2013-09-20 17:57:23 -07:00
Jeff Forcier 0ba34035c3 Not sure how this got updated :( 2013-09-20 17:56:20 -07:00
Jeff Forcier 777d1576ca Bump dev version 2013-04-28 19:01:40 -07:00
Jeff Forcier 02d071be07 Bump version to 1.10.1 2013-04-05 13:00:19 -07:00
Jeff Forcier 10c51e2726 Bump dev version to 1.10 2012-11-28 22:18:44 -08:00
Jeff Forcier 7f4c26f860 Cut 1.8.1 2012-11-06 13:08:41 -08:00
Jeff Forcier a3b44c7ed9 Bump to 1.9.0 for release 2012-11-06 13:06:08 -08:00
Jeff Forcier 09488c665b 80-col fix 2012-09-25 22:09:49 -07:00
Jeff Forcier 71456b8990 Correct dev-installation doc in package metadata 2012-09-25 18:10:28 -07:00
Jeff Forcier dd6fb2577d Bump to 0.8.x due to nontrivial changes
(cherry picked from commit d7def60c4784fed39fc8714753304a150da131c7)

Conflicts:
	setup.py
2012-09-24 19:00:19 -07:00
Laurent Peuch 400ea089d5 add the url to github in the setup.py for pypi
(cherry picked from commit abfefc2f95c377cc134d9b0b71c8cdd692f321c8)

Conflicts:
	setup.py
2012-09-24 18:56:20 -07:00
Jeff Forcier 01735419f3 Bump to 1.7.14
(cherry picked from commit c3a7e9d587)

Conflicts:
	setup.py
2012-09-23 16:20:01 -07:00
Bobby Impollonia bd5c843040 Replace hard tabs with spaces
(cherry picked from commit c07eddb9e1)
2012-09-23 16:18:56 -07:00
Silas Sewell e375d671a4 Fix FSF address
(cherry picked from commit 4db2ca594b)

CHANGED: only applied the address change to LICENSE and setup.py.

Rest left untouched. :effort:
2012-09-23 16:16:57 -07:00
Jeff Forcier 11ca8134a2 Cut 1.7.13
(cherry picked from commit 998377f353)

Conflicts:
	setup.py
2012-09-23 16:11:18 -07:00
Jeff Forcier ac7f513ee8 Release 1.7.12
(cherry picked from commit c630917d0d)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:09:44 -07:00
Jeff Forcier c903245ed9 Trying something stupid re: ==dev
(cherry picked from commit 543651bfd2)

Conflicts:
	setup.py
2012-09-23 16:07:40 -07:00
Jeff Forcier d3b48e9b44 Bump to 1.7.11
(cherry picked from commit 9234baed01)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:07:03 -07:00
Jeff Forcier 10beb86e9e Partially revert centralized version stuff
(cherry picked from commit d9ba7a644c)

Conflicts:
	setup.py
2012-09-23 16:05:00 -07:00
Jeff Forcier 013d459487 Goofed up the RST
(cherry picked from commit 175075e045)
2012-09-23 16:04:10 -07:00
Jeff Forcier 7b7b23572b Let's not have 5 different freakin version strings
Also bumps to 1.7.10
(cherry picked from commit 01eea3326a)

Conflicts:
	README
	paramiko/__init__.py
	paramiko/transport.py
	setup.py
2012-09-23 16:03:38 -07:00
Jeff Forcier 5f839942c7 add ==dev install URL to setup.py
(cherry picked from commit e72b53788d)
2012-09-23 15:56:08 -07:00
Jeff Forcier a94f73a392 Bump to 1.7.9, setup.py/crypto update
(cherry picked from commit ea8e73a389)

Conflicts:
	setup.py
2012-09-23 14:37:44 -07:00
Jeff Forcier 987de8e7d5 Crypto released a setuptools bugfix as 2.4.1.
(cherry picked from commit 2279ef6909)
2012-09-23 14:36:56 -07:00
Jeff Forcier 96d8eafc47 Crypto 2.4 doesn't play well with setup.py/setuptools
(cherry picked from commit 12cf1674fc)
2012-09-23 14:36:36 -07:00
Jeff Forcier 99859b8b02 Update version to 1.7.8, no need for 4 parts
(cherry picked from commit 5e0a329028)

Conflicts:
	README
	paramiko/__init__.py
	setup.py
2012-09-23 14:28:34 -07:00
Jeff Forcier 13e65a2ce0 Tweak setup.py to match README
(cherry picked from commit 673c427fe6)

Conflicts:
	setup.py
2012-09-23 14:24:27 -07:00
Jeff Forcier 322819454d Increment version for release 2012-05-16 16:03:10 -07:00
Robey Pointer 7bcbc24198 version 1.7.7.1 2011-05-23 13:49:47 -07:00
Robey Pointer db1c1efb7f remove the download link since that seems flaky 2011-05-21 19:42:28 -07:00
Robey Pointer 33482ff338 require a newer version of pycrypto and point to the new page 2011-05-21 19:08:46 -07:00
Robey Pointer cb913d5d32 bump to 1.7.6. 2009-11-01 22:01:04 -08:00
Robey Pointer 60c6e94e7d fix my email address to be the current one. 2009-07-19 19:45:02 -07:00
Robey Pointer 2fda984906 [project @ robey@lag.net-20080707012221-5fz3q4j2gvqlbmhl]
bump version to 1.7.4 (desmond).
2008-07-06 18:22:21 -07:00
Robey Pointer c52b11ba17 [project @ robey@lag.net-20080324065154-w8p2lhawmsbynxc0]
bump version to 1.7.3 (clara)
2008-03-23 23:51:54 -07:00