From 075f5c0338cf48e2b0280dd97b35aa6e40d94b3d Mon Sep 17 00:00:00 2001 From: Olle Lundberg Date: Thu, 14 Aug 2014 12:03:32 +0200 Subject: Support py3.4. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7042570f..c7abce9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "2.7" - "3.2" - "3.3" + - "3.4" install: # Self-install for setup.py-driven deps - pip install -e . -- cgit v1.2.3 From a146374936f5eb8f4736af3f7297117cdf5d291b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 18 Sep 2014 15:18:51 -0700 Subject: Add ability to run Kerberos tests to the test runner. Includes merging coverage task into test task --- .travis.yml | 3 ++- kerberos-requirements.txt | 2 ++ tasks.py | 16 +++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 kerberos-requirements.txt (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3f6f7331..604b6fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,10 @@ install: # Dev (doc/test running) requirements - pip install coveralls # For coveralls.io specifically - pip install -r dev-requirements.txt + - pip install -r kerberos-requirements.txt # for GSSAPI tests script: # Main tests, with coverage! - - invoke coverage + - inv test --coverage --kerberos # 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/kerberos-requirements.txt b/kerberos-requirements.txt new file mode 100644 index 00000000..0e8c156a --- /dev/null +++ b/kerberos-requirements.txt @@ -0,0 +1,2 @@ +pyasn1>=0.1.7 +python-gssapi>=0.6.1 diff --git a/tasks.py b/tasks.py index cf43a5fd..68912ce0 100644 --- a/tasks.py +++ b/tasks.py @@ -27,12 +27,14 @@ www = Collection.from_module(_docs, name='www', config={ # Until we move to spec-based testing @task -def test(ctx): - ctx.run("python test.py --verbose", pty=True) - -@task -def coverage(ctx): - ctx.run("coverage run --source=paramiko test.py --verbose") +def test(ctx, kerberos=False, coverage=False): + runner = "python" + if coverage: + runner = "coverage run --source=paramiko" + flags = "--verbose" + if kerberos: + flags += " --gssapi-test --test-gssauth --test-gssapi-keyex" + ctx.run("{0} test.py {1}".format(runner, flags), pty=True) # Until we stop bundling docs w/ releases. Need to discover use cases first. @@ -48,4 +50,4 @@ def release(ctx): publish(ctx, wheel=True) -ns = Collection(test, coverage, release, docs=docs, www=www) +ns = Collection(test, release, docs=docs, www=www) -- cgit v1.2.3 From cbbf7106f8c6e2b0275fc65f17c8c419a2028d8a Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 18 Sep 2014 16:07:53 -0700 Subject: Revert attempts to run Kerberos tests :( --- .travis.yml | 3 +-- kerberos-requirements.txt | 2 -- tasks.py | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 kerberos-requirements.txt (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 604b6fd2..a9a04c89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,9 @@ install: # Dev (doc/test running) requirements - pip install coveralls # For coveralls.io specifically - pip install -r dev-requirements.txt - - pip install -r kerberos-requirements.txt # for GSSAPI tests script: # Main tests, with coverage! - - inv test --coverage --kerberos + - inv test --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/kerberos-requirements.txt b/kerberos-requirements.txt deleted file mode 100644 index 0e8c156a..00000000 --- a/kerberos-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pyasn1>=0.1.7 -python-gssapi>=0.6.1 diff --git a/tasks.py b/tasks.py index 68912ce0..b236ee42 100644 --- a/tasks.py +++ b/tasks.py @@ -27,13 +27,11 @@ www = Collection.from_module(_docs, name='www', config={ # Until we move to spec-based testing @task -def test(ctx, kerberos=False, coverage=False): +def test(ctx, coverage=False): runner = "python" if coverage: runner = "coverage run --source=paramiko" flags = "--verbose" - if kerberos: - flags += " --gssapi-test --test-gssauth --test-gssapi-keyex" ctx.run("{0} test.py {1}".format(runner, flags), pty=True) -- cgit v1.2.3 From e287d6b70c5de5470393210623a46741f73a526d Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 30 Sep 2015 14:41:26 -0700 Subject: Don't use --coverage for tests under 3.2 anymore --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 9a55dbb6..45fb1722 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ install: - pip install coveralls # For coveralls.io specifically - pip install -r dev-requirements.txt script: - # Main tests, with coverage! - - inv test --coverage + # Main tests, w/ coverage! (but skip coverage on 3.2, coverage.py dropped it) + - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && inv test --coverage || inv test" # 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 -- cgit v1.2.3 From d22597b558ca8a1465352497e5adfd5d79cf4f3a Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 2 Nov 2015 17:24:41 -0800 Subject: Really, really sick of Python 3.2 being shite to support. Step 1: make it stop tanking Travis builds randomly. --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 64f64e60..dc5bd561 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: false python: - "2.6" - "2.7" - - "3.2" - "3.3" install: # Self-install for setup.py-driven deps @@ -18,9 +17,7 @@ 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. - # 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" + - invoke docs -o -W www -o -W notifications: irc: channels: "irc.freenode.org#paramiko" -- cgit v1.2.3 From 583d6eaedfe2b004777b100ab8a8185bb9bec073 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 2 Nov 2015 17:32:00 -0800 Subject: We ought to work on python 3.4/3.5... --- .travis.yml | 2 ++ setup.py | 2 ++ 2 files changed, 4 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index dc5bd561..f841a71e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ python: - "2.6" - "2.7" - "3.3" + - "3.4" + - "3.5" install: # Self-install for setup.py-driven deps - pip install -e . diff --git a/setup.py b/setup.py index 235fd0e3..9e08323d 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,8 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], **kw ) -- cgit v1.2.3 From e51b24ac8060bda099bcc5ea6c18f96f062aaad8 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 5 Nov 2015 17:19:16 -0800 Subject: Missed a spot re: 3.2 specific crap in Travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c2c20a60..55cba46d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ install: - pip install coveralls # For coveralls.io specifically - pip install -r dev-requirements.txt script: - # Main tests, w/ coverage! (but skip coverage on 3.2, coverage.py dropped it) - - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && inv test --coverage || inv test" + # Main tests, w/ coverage! + - inv test --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 -- cgit v1.2.3