From 103d056a779d891ede6653f4b205a4b1dfad22e9 Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Tue, 19 Nov 2013 12:08:13 -0800 Subject: [PATCH] Remove Python 2.5 from travis and fix minimum required version in init and README --- .travis.yml | 1 - README | 4 ++-- paramiko/__init__.py | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ebb931..5de0a5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.5" - "2.6" - "2.7" - "3.2" diff --git a/README b/README index 1899819..ae50a80 100644 --- a/README +++ b/README @@ -15,7 +15,7 @@ What ---- "paramiko" is a combination of the esperanto words for "paranoid" and -"friend". it's a module for python 2.5+ that implements the SSH2 protocol +"friend". it's a module for python 2.6+ that implements the SSH2 protocol for secure (encrypted and authenticated) connections to remote machines. unlike SSL (aka TLS), SSH2 protocol does not require hierarchical certificates signed by a powerful central authority. you may know SSH2 as @@ -34,7 +34,7 @@ that should have come with this archive. Requirements ------------ - - python 2.5 or better + - python 2.6 or better - pycrypto 2.1 or better If you have setuptools, you can build and install paramiko and all its diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 160ed39..48e2ee2 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -18,7 +18,7 @@ """ I{Paramiko} (a combination of the esperanto words for "paranoid" and "friend") -is a module for python 2.5 or greater that implements the SSH2 protocol for +is a module for python 2.6 or greater that implements the SSH2 protocol for secure (encrypted and authenticated) connections to remote machines. Unlike SSL (aka TLS), the SSH2 protocol does not require hierarchical certificates signed by a powerful central authority. You may know SSH2 as the protocol that @@ -52,8 +52,8 @@ Mailing list: U{paramiko@librelist.com} import sys -if sys.version_info < (2, 5): - raise RuntimeError('You need python 2.5+ for this module.') +if sys.version_info < (2, 6): + raise RuntimeError('You need python 2.6+ for this module.') __author__ = "Jeff Forcier "