From b55bf94f888d91807dcbe6cb30c1116ff34e28dc Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Tue, 24 Oct 2017 22:57:49 +0200 Subject: [PATCH 1/7] first attempt at solving ci problems --- .travis.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5d976c..97f606d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,18 @@ python: 2.7 sudo: false -env: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=pypy +matrix: + include: + - python: "2.6" + env: TOXENV=py26 + - python: "2.7" + env: TOXENV=py27 + - python: "3.3" + env: TOXENV=py33 + - python: "3.4" + env: TOXENV=py34 + - python: pypy-5.7.1 + env: TOXENV=pypy install: # Install tox and flake8 style checker From d73ed7590ed71129b51920f0d3fc9cd5100c669b Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Tue, 24 Oct 2017 22:59:38 +0200 Subject: [PATCH 2/7] fix typos --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97f606d..1818dc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,15 @@ sudo: false matrix: include: - python: "2.6" - env: TOXENV=py26 + env: TOX_ENV=py26 - python: "2.7" - env: TOXENV=py27 + env: TOX_ENV=py27 - python: "3.3" - env: TOXENV=py33 + env: TOX_ENV=py33 - python: "3.4" - env: TOXENV=py34 + env: TOX_ENV=py34 - python: pypy-5.7.1 - env: TOXENV=pypy + env: TOX_ENV=pypy install: # Install tox and flake8 style checker From a1938d4c2ad69efa172e89e802446aac3c1dfab5 Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Tue, 24 Oct 2017 23:09:27 +0200 Subject: [PATCH 3/7] expansion attempt with python 3.5m 3.6 and pypy3 --- .travis.yml | 8 +++++++- tox.ini | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1818dc9..24f1820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,14 @@ matrix: env: TOX_ENV=py33 - python: "3.4" env: TOX_ENV=py34 - - python: pypy-5.7.1 + - python: "3.5" + env: TOX_ENV=py35 + - python: "3.6" + env: TOX_ENV=py36 + - python: "pypy" env: TOX_ENV=pypy + - python: "pypy3" + env: TOX_ENV=pypy3 install: # Install tox and flake8 style checker diff --git a/tox.ini b/tox.ini index 6d5f081..c8fd34d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, pypy +envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3 skipsdist = True [testenv] From de6841ef9956080221f2a24db79d67084d9dc143 Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Tue, 24 Oct 2017 23:17:20 +0200 Subject: [PATCH 4/7] updating top --- .travis.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24f1820..24a5549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: install: # Install tox and flake8 style checker - - pip install tox==1.7.2 flake8==2.1.0 + - pip install tox==2.9.1 flake8==2.1.0 script: # Run the library through flake8 diff --git a/requirements-dev.txt b/requirements-dev.txt index 4d3e4f5..1b7464b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,4 +3,4 @@ # Additional requirements for development sphinx==1.2.1 -tox==1.7.2 +tox==2.9.1 From a152b37150a96fc38a81969d0f62b606be8ed29e Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Wed, 25 Oct 2017 00:05:09 +0200 Subject: [PATCH 5/7] removing 3.5, 3.6 and pypy3 --- .travis.yml | 16 +++++----------- tox.ini | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a5549..82ee397 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,22 +5,16 @@ sudo: false matrix: include: - - python: "2.6" + - python: 2.6 env: TOX_ENV=py26 - - python: "2.7" + - python: 2.7 env: TOX_ENV=py27 - - python: "3.3" + - python: 3.3 env: TOX_ENV=py33 - - python: "3.4" + - python: 3.4 env: TOX_ENV=py34 - - python: "3.5" - env: TOX_ENV=py35 - - python: "3.6" - env: TOX_ENV=py36 - - python: "pypy" + - python: pypy env: TOX_ENV=pypy - - python: "pypy3" - env: TOX_ENV=pypy3 install: # Install tox and flake8 style checker diff --git a/tox.ini b/tox.ini index c8fd34d..6d5f081 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3 +envlist = py26, py27, py33, py34, pypy skipsdist = True [testenv] From bd16b75f9d427d1446fd7f5d343ce746e5f72350 Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Wed, 25 Oct 2017 00:23:28 +0200 Subject: [PATCH 6/7] attempt at adding python3.5 and python3.6 compatibility --- requirements-test.txt | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 2a9855f..c86db9a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -2,9 +2,9 @@ -e . # Additional requirements for running the testsuite -pytest==2.6.2 +pytest==3.2.3 coverage==3.7.1 -pytest-cov==1.8.0 +pytest-cov==2.5.1 flake8==2.1.0 freezegun==0.3.8 six==1.10 diff --git a/tox.ini b/tox.ini index 6d5f081..9cc0854 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, pypy +envlist = py26, py27, py33, py34, py35, py36, pypy skipsdist = True [testenv] From 9066911f996e1ae9cc13e502abe2ae555b7951fa Mon Sep 17 00:00:00 2001 From: GliderGeek Date: Wed, 25 Oct 2017 00:26:28 +0200 Subject: [PATCH 7/7] add missing lines in travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 82ee397..0ed7664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ matrix: env: TOX_ENV=py33 - python: 3.4 env: TOX_ENV=py34 + - python: 3.5 + env: TOX_ENV=py35 + - python: 3.6 + env: TOX_ENV=py36 - python: pypy env: TOX_ENV=pypy