From b83fc90021d525ca2d995f1dba4ecedb7cf3e27f Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Wed, 10 Apr 2019 18:32:43 +0200
Subject: [PATCH] Test against python 3.5
---
.travis.yml | 35 ++++++++++++++++++++---------------
tox.ini | 8 ++++----
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4c8f91c4..41e86046 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,25 @@
# TODO: test condor
language: python
-python: 2.7
-sudo: required
-env:
- - TOX_ENV=py27-lint
- - TOX_ENV=py34-lint
- - TOX_ENV=py27-lint-readme
- - TOX_ENV=lint-docs
- - TOX_ENV=py27 SETUP=true
- - TOX_ENV=py34 SETUP=true
- - TOX_ENV=py34-unit SETUP=true
- - TOX_ENV=py27-install-wheel
+matrix:
+ include:
+ - python: 2.7
+ env: TOX_ENV=py27-lint
+ - python: 2.7
+ env: TOX_ENV=py27-lint-readme
+ - python: 2.7
+ env: TOX_ENV=lint-docs
+ - python: 2.7
+ env: TOX_ENV=py27 SETUP=true
+ - python: 2.7
+ env: TOX_ENV=py27-install-wheel
+ - python: 3.5
+ env: TOX_ENV=py35-lint
+ - python: 3.5
+ env: TOX_ENV=py35 SETUP=true
+ - python: 3.5
+ env: TOX_ENV=py35-unit SETUP=true
+ allow_failures:
+ - env: TOX_ENV=py35 SETUP=true
install:
- pip install tox
@@ -18,9 +27,5 @@ install:
script: export PULSAR_TEST_KEY=test_data/testkey; export TEST_WEBAPP_POST_SHUTDOWN_SLEEP=1; . local_env.sh; tox -e $TOX_ENV
-matrix:
- allow_failures:
- - env: TOX_ENV=py34 SETUP=true
-
after_success:
- coveralls
diff --git a/tox.ini b/tox.ini
index d550a99f..d4561361 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py27-lint, py27-lint-readme, lint-docs, py34-lint, py27, py34, py27-unit, py34-unit
+envlist = py27-lint, py27-lint-readme, lint-docs, py35-lint, py27, py34, py27-unit, py34-unit
toxworkdir={env:TOX_WORK_DIR:.tox}
[testenv]
@@ -13,13 +13,13 @@ passenv = DRMAA_LIBRARY_PATH
[testenv:py27-unit]
commands = nosetests --exclude '.*integration.*' []
-[testenv:py34]
+[testenv:py35]
deps =
-rrequirements3.txt
-rdev-requirements.txt
drmaa
-[testenv:py34-unit]
+[testenv:py35-unit]
commands = nosetests --verbose --exclude '.*integration.*' []
deps =
-rrequirements3.txt
@@ -32,7 +32,7 @@ commands = flake8 pulsar test
skip_install = True
deps = flake8
-[testenv:py34-lint]
+[testenv:py35-lint]
commands = flake8 pulsar test
skip_install = True
deps = flake8
--
GitLab