From 74c80e13018b3514d273797c69a1f1e8e7905a88 Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <medecau@gmail.com>
Date: Sat, 15 Apr 2017 08:58:38 +0100
Subject: code style is directed at the pycco module only

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 67d9a5d..b59d37a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@ envlist = py2,py3,codestyle
 
 [testenv]
 deps = -rrequirements.test.txt
-commands = py.test
+commands = pytest
 
 [testenv:codestyle]
 deps = pycodestyle
 # E501 - line too long
-commands = pycodestyle --ignore=E501
+commands = pycodestyle --ignore=E501 pycco
-- 
cgit v1.2.1


From e3fde73f0354e55e27e958edf565e413c5029818 Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <medecau@gmail.com>
Date: Sat, 15 Apr 2017 08:59:04 +0100
Subject: fixes codestyle errors

---
 pycco/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pycco/main.py b/pycco/main.py
index 55ab0ff..f0d4fcf 100644
--- a/pycco/main.py
+++ b/pycco/main.py
@@ -535,6 +535,7 @@ def process(sources, preserve_paths=True, outdir=None, language=None,
             with open(path.join(outdir, "index.html"), "wb") as f:
                 f.write(generate_index.generate_index(generated_files, outdir))
 
+
 __all__ = ("process", "generate_documentation")
 
 
@@ -630,6 +631,7 @@ def main():
 
         monitor(sources, opts)
 
+
 # Run the script.
 if __name__ == "__main__":
     main()
-- 
cgit v1.2.1


From 0881b24639a0a7d3d0ce45563233dbd2a78ccc92 Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <medecau@gmail.com>
Date: Sat, 15 Apr 2017 09:00:00 +0100
Subject: adds tox tests to travis

---
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 62e7c6b..a392149 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,20 @@
+sudo: false
 language: python
 python:
     - '2.7'
     - '3.5'
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27
+      install: tox
+      script: tox
+    - python: 3.6
+      env: TOXENV=py36
+      install: tox
+      script: tox
+    - python: 3.5
+      env: CODESTYLE=true
 install:
     - 'pip install -r requirements.txt'
     - 'pip install -r requirements.test.txt'
-- 
cgit v1.2.1


From 2c2e9fea84014c9006121eb1ba4556b8ac25bb4e Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <medecau@gmail.com>
Date: Sat, 15 Apr 2017 09:03:27 +0100
Subject: fixes travis install command tox environment is more specific

---
 .travis.yml | 4 ++--
 tox.ini     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a392149..3443282 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,11 @@ matrix:
   include:
     - python: 2.7
       env: TOXENV=py27
-      install: tox
+      install: pip install tox
       script: tox
     - python: 3.6
       env: TOXENV=py36
-      install: tox
+      install: pip install tox
       script: tox
     - python: 3.5
       env: CODESTYLE=true
diff --git a/tox.ini b/tox.ini
index b59d37a..d774271 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py2,py3,codestyle
+envlist = py27,py36,codestyle
 
 [testenv]
 deps = -rrequirements.test.txt
-- 
cgit v1.2.1


From 8d274807a2478817bc3f40f1ee3d73660461d7a9 Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <medecau@gmail.com>
Date: Sat, 15 Apr 2017 09:40:15 +0100
Subject: moves matrix down in the config file and rearranges the tox section

---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3443282..a4d0789 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,18 @@ language: python
 python:
     - '2.7'
     - '3.5'
+install:
+    - 'pip install -r requirements.txt'
+    - 'pip install -r requirements.test.txt'
+script:
+    - 'py.test --cov=pycco tests/'
+    - 'python -m pycco.main pycco/main.py'
+after_success:
+    - coveralls
 matrix:
   include:
+    - python: 3.5
+      env: CODESTYLE=true
     - python: 2.7
       env: TOXENV=py27
       install: pip install tox
@@ -13,13 +23,3 @@ matrix:
       env: TOXENV=py36
       install: pip install tox
       script: tox
-    - python: 3.5
-      env: CODESTYLE=true
-install:
-    - 'pip install -r requirements.txt'
-    - 'pip install -r requirements.test.txt'
-script:
-    - 'py.test --cov=pycco tests/'
-    - 'python -m pycco.main pycco/main.py'
-after_success:
-    - coveralls
-- 
cgit v1.2.1