From 3162b42c36592069be58fed106d55d5000e4441a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:17:46 +0200 Subject: [PATCH 1/7] Badges --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index bf55f25..e9d6eaf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # SECRETARY +.. image:: https://img.shields.io/pypi/v/secretary.svg + :target: https://pypi.python.org/pypi/secretary + +.. image:: https://img.shields.io/travis/christopher-ramirez/secretary.svg + :target: https://travis-ci.org/christopher-ramirez/secretary + #### Take the power of Jinja2 templates to OpenOffice and LibreOffice and create reports in your web applications. From d748ecd785cb540e5ed908ee8029b2f0e6a275b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:17:59 +0200 Subject: [PATCH 2/7] Make TravisCI use tox configuration --- .travis.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f07d49e..c5914ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,12 @@ +env: +- TOXENV=py36 +- TOXENV=py35 +- TOXENV=py34 +- TOXENV=py33 +- TOXENV=py3 +- TOXENV=py27 +- TOXENV=py26 +install: pip install -U tox language: python -python: - - "2.6" - - "2.7" - - "3.3" -install: "python setup.py develop" -script: "python setup.py test" +python: 3.6 +script: tox -e ${TOXENV} From 31e4f257247ea8a6e06a16ec650d852b7f77318e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:18:09 +0200 Subject: [PATCH 3/7] More Python versions --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6fb3487..6f64342 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py3, py33, py34 +envlist = py26, py27, py3, py33, py34, py35, py36 [testenv] deps = pytest From 80bc2f243e7cc77d1ac62075979d9520c789218e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:29:36 +0200 Subject: [PATCH 4/7] Badges, again --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e9d6eaf..994bf52 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # SECRETARY -.. image:: https://img.shields.io/pypi/v/secretary.svg - :target: https://pypi.python.org/pypi/secretary - -.. image:: https://img.shields.io/travis/christopher-ramirez/secretary.svg - :target: https://travis-ci.org/christopher-ramirez/secretary + + + + + + + + #### Take the power of Jinja2 templates to OpenOffice and LibreOffice and create reports in your web applications. From 30f4f5207d66ac808ce7f2cf22857aeeca2d7351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:34:31 +0200 Subject: [PATCH 5/7] Change base python to 3.5, because it broke (https://travis-ci.org/mpasternak/secretary/jobs/228097578) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5914ea..13539e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ env: - TOXENV=py26 install: pip install -U tox language: python -python: 3.6 +python: 3.5 script: tox -e ${TOXENV} From 3b93437db5fe92b81cc3d685e491c90f543c2919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:35:09 +0200 Subject: [PATCH 6/7] Strip whitespace --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 994bf52..9dec62d 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # SECRETARY - - - - - - - + + + + + + #### Take the power of Jinja2 templates to OpenOffice and LibreOffice and create reports in your web applications. From e01dead7279c6aaaeecc2a83edf06e63f86cc0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Tue, 2 May 2017 22:39:43 +0200 Subject: [PATCH 7/7] Let's try another way then --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13539e9..c5c2fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ -env: -- TOXENV=py36 -- TOXENV=py35 -- TOXENV=py34 -- TOXENV=py33 -- TOXENV=py3 -- TOXENV=py27 -- TOXENV=py26 install: pip install -U tox language: python -python: 3.5 -script: tox -e ${TOXENV} +python: + - 2.6 + - 2.7 + - 3.3 + - 3.4 + - 3.5 + - 3.6 +script: tox -e py${TRAVIS_PYTHON_VERSION//./}