From a32addcfb781199b2216d7b87cf3178b97620809 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 6 Nov 2012 13:13:00 -0800 Subject: Tweak travis config --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 312a1846..90dbb80f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ install: - pip install -e . script: python test.py notifications: + email: + on_failure: change irc: channels: "irc.freenode.org#fabric" on_success: change -- cgit v1.2.3 From 7255dcf042d3099d8b8f7d618da0fbc19e401008 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 15:37:22 -0800 Subject: 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 --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 90dbb80f..6896b897 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ install: - pip install -e . script: python test.py notifications: - email: - on_failure: change irc: - channels: "irc.freenode.org#fabric" + channels: "irc.freenode.org#paramiko" on_success: change on_failure: change -- cgit v1.2.3 From 152f1268699d7b5f1d2900cf06270d20aa838d60 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 27 Sep 2013 20:09:41 -0700 Subject: Use verbose test output for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 6896b897..43a42798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: install: # Self-install for setup.py-driven deps - pip install -e . -script: python test.py +script: python test.py --verbose notifications: irc: channels: "irc.freenode.org#paramiko" -- cgit v1.2.3 From e5822c9fa1b9243639450369b80df2746df714d0 Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Wed, 30 Oct 2013 16:02:01 -0700 Subject: Add Py3.2 and Py3.3 to travis --- .travis.yml | 2 ++ tests/__init__.py | 0 2 files changed, 2 insertions(+) create mode 100644 tests/__init__.py (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 43a42798..7ebb9312 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ python: - "2.5" - "2.6" - "2.7" + - "3.2" + - "3.3" install: # Self-install for setup.py-driven deps - pip install -e . diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3 From 103d056a779d891ede6653f4b205a4b1dfad22e9 Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Tue, 19 Nov 2013 12:08:13 -0800 Subject: 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(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7ebb9312..5de0a5b0 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 1899819a..ae50a80f 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 160ed393..48e2ee20 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 " -- cgit v1.2.3 From 91a80666864f453cb1786edbec99376afbc84538 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 31 Dec 2013 19:14:36 -0800 Subject: No more Python 2.5 on Travis :( --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 43a42798..ce7acc5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.5" - "2.6" - "2.7" install: -- cgit v1.2.3 From c695a931ff93605668001526643cb2cad12e8e2b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 31 Dec 2013 19:24:10 -0800 Subject: Update travis settings to be similar to fab's --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ce7acc5f..88b69936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,9 @@ script: python test.py --verbose notifications: irc: channels: "irc.freenode.org#paramiko" + template: + - "%{repository}@%{branch}: %{message} (%{build_url})" on_success: change on_failure: change + use_notice: true + email: false -- cgit v1.2.3 From 5c5bf6e844d63a14f586d9166c536ab0978b684b Mon Sep 17 00:00:00 2001 From: Olle Lundberg Date: Tue, 21 Jan 2014 18:50:20 +0100 Subject: Add coveralls. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 88b69936..c9802a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ python: install: # Self-install for setup.py-driven deps - pip install -e . -script: python test.py --verbose + - pip install coveralls +script: coverage run --source=paramiko test.py --verbose notifications: irc: channels: "irc.freenode.org#paramiko" @@ -15,3 +16,5 @@ notifications: on_failure: change use_notice: true email: false +after_success: + - coveralls -- cgit v1.2.3 From 7d56ecb1a7d1654ae971e9896aa26e938454d3ea Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 10 Jan 2014 20:07:43 -0800 Subject: Meta prep work (reqs.txt, tasks.py) --- .gitignore | 1 + .travis.yml | 4 +++- dev-requirements.txt | 6 ++++++ requirements.txt | 2 -- site/dev-requirements.txt | 3 --- site/tasks.py | 19 ------------------- tasks.py | 20 ++++++++++++++++++++ tox-requirements.txt | 2 ++ tox.ini | 2 +- 9 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt delete mode 100644 site/dev-requirements.txt delete mode 100644 site/tasks.py create mode 100644 tasks.py create mode 100644 tox-requirements.txt (limited to '.travis.yml') diff --git a/.gitignore b/.gitignore index 4b578950..a125b270 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist/ paramiko.egg-info/ test.log docs/ +_build diff --git a/.travis.yml b/.travis.yml index c9802a80..29e44e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ python: install: # Self-install for setup.py-driven deps - pip install -e . - - pip install coveralls + # Dev (doc/test running) requirements + - pip install coveralls # For coveralls.io specifically + - pip install -r dev-requirements.txt script: coverage run --source=paramiko test.py --verbose notifications: irc: diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 00000000..59a1f144 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,6 @@ +# For newer tasks like building Sphinx docs. +# NOTE: Requires Python >=2.6 +invoke>=0.6.1 +invocations>=0.4.4 +sphinx>=1.1.3 +alabaster>=0.1.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a23..00000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/site/dev-requirements.txt b/site/dev-requirements.txt deleted file mode 100644 index 524b8060..00000000 --- a/site/dev-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -invoke>=0.6.1 -invocations>=0.4.4 -sphinx==1.1.3 diff --git a/site/tasks.py b/site/tasks.py deleted file mode 100644 index e2d952b1..00000000 --- a/site/tasks.py +++ /dev/null @@ -1,19 +0,0 @@ -from invoke import Collection -from invocations import docs, testing - -# TODO: let from_module specify new name -api = Collection.from_module(docs) -# TODO: maybe allow rolling configuration into it too heh -api.configure({ - 'sphinx.source': 'api', - 'sphinx.target': 'api/_build', -}) -api.name = 'api' -site = Collection.from_module(docs) -site.name = 'site' -site.configure({ - 'sphinx.source': 'site', - 'sphinx.target': 'site/_build', -}) - -ns = Collection(testing.test, api=api, site=site) diff --git a/tasks.py b/tasks.py new file mode 100644 index 00000000..d470dab0 --- /dev/null +++ b/tasks.py @@ -0,0 +1,20 @@ +from invoke import Collection +from invocations import docs, testing + + +# TODO: let from_module specify new name +api = Collection.from_module(docs) +# TODO: maybe allow rolling configuration into it too heh +api.configure({ + 'sphinx.source': 'api', + 'sphinx.target': 'api/_build', +}) +api.name = 'api' +site = Collection.from_module(docs) +site.name = 'site' +site.configure({ + 'sphinx.source': 'site', + 'sphinx.target': 'site/_build', +}) + +ns = Collection(testing.test, api=api, site=site) diff --git a/tox-requirements.txt b/tox-requirements.txt new file mode 100644 index 00000000..26224ce6 --- /dev/null +++ b/tox-requirements.txt @@ -0,0 +1,2 @@ +# Not sure why tox can't just read setup.py? +pycrypto diff --git a/tox.ini b/tox.ini index 6cb80012..af4fbf20 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r tox-requirements.txt python test.py -- cgit v1.2.3 From fee04a39ec45baefff84c8a58540fa3401b4a826 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 28 Jan 2014 15:23:11 -0800 Subject: Add sites/docs building to Travis --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 29e44e53..98a54829 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,12 @@ install: # Dev (doc/test running) requirements - pip install coveralls # For coveralls.io specifically - pip install -r dev-requirements.txt -script: coverage run --source=paramiko test.py --verbose +script: + # Main tests, with coverage! + - coverage run --source=paramiko test.py --verbose + # Ensure documentation & invoke pipeline run OK + - invoke www + - invoke docs notifications: irc: channels: "irc.freenode.org#paramiko" -- cgit v1.2.3 From d1d65b4ddde17a97d25a79aeaad6c3068846cb36 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 28 Jan 2014 15:53:26 -0800 Subject: Stricter/more useful doc builds in Travis --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 98a54829..df7c225a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,12 @@ install: script: # Main tests, with coverage! - coverage run --source=paramiko test.py --verbose - # Ensure documentation & invoke pipeline run OK - - invoke www - - invoke docs + # Ensure documentation & invoke pipeline run OK. + # Run 'docs' first since its objects.inv is referred to by 'www'. + # Also force warnings to be errors since most of them tend to be actual + # problems. + - invoke docs -o -W + - invoke www -o -W notifications: irc: channels: "irc.freenode.org#paramiko" -- cgit v1.2.3 From 2d3b13e91705a2940f8af0c3d363190bee85ea0d Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 11 Feb 2014 09:31:43 -0800 Subject: Add coverage command as Invoke task --- .gitignore | 1 + .travis.yml | 2 +- tasks.py | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.gitignore b/.gitignore index 9e1febf3..e149bb8c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ test.log docs/ !sites/docs _build +.coverage diff --git a/.travis.yml b/.travis.yml index df7c225a..97165c47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - pip install -r dev-requirements.txt script: # Main tests, with coverage! - - coverage run --source=paramiko test.py --verbose + - invoke coverage # Ensure documentation & invoke pipeline run OK. # Run 'docs' first since its objects.inv is referred to by 'www'. # Also force warnings to be errors since most of them tend to be actual diff --git a/tasks.py b/tasks.py index 79cb94f0..f8f4017d 100644 --- a/tasks.py +++ b/tasks.py @@ -26,5 +26,9 @@ www = Collection.from_module(_docs, name='www', config={ def test(ctx): ctx.run("python test.py --verbose") +@task +def coverage(ctx): + ctx.run("coverage run --source=paramiko test.py --verbose") + -ns = Collection(test, docs=docs, www=www) +ns = Collection(test, coverage, docs=docs, www=www) -- cgit v1.2.3 From 23fc8a76da7cd376aef1f27bdd5fc4d7416ced04 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 5 Sep 2014 10:10:15 -0700 Subject: No notices for travis irc notifications --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7042570f..801356e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,6 @@ notifications: - "%{repository}@%{branch}: %{message} (%{build_url})" on_success: change on_failure: change - use_notice: true email: false after_success: - coveralls -- cgit v1.2.3 From 4aa798ef21dc643a271e4ff5581ddf7cbde4c144 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 5 Sep 2014 11:40:12 -0700 Subject: Try skipping docs builds under Python 3.2 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 801356e0..e17bdafd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,9 @@ script: # Run 'docs' first since its objects.inv is referred to by 'www'. # Also force warnings to be errors since most of them tend to be actual # problems. - - invoke docs -o -W - - invoke www -o -W + # Finally, skip them under Python 3.2 due to sphinx shenanigans + - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke docs -o -W || true" + - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke www -o -W || true" notifications: irc: channels: "irc.freenode.org#paramiko" -- cgit v1.2.3 From b3ed2d5b7eef96a349809517e2d782fca3906e94 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 17 Dec 2014 15:12:29 -0800 Subject: Try using new Travis container-based workers --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e17bdafd..64f64e60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +sudo: false python: - "2.6" - "2.7" -- cgit v1.2.3