From 258676ec89b1f1d7e624e44dc67c375ae66cebf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Barci=C5=9B?= <232002@gmail.com>
Date: Tue, 13 Dec 2016 11:07:09 +0100
Subject: [PATCH 1/5] added tox support

---
 .gitignore |  4 ++++
 setup.py   |  5 ++++-
 tox.ini    | 12 ++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index e9af22b..5804013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 .idea
+*.swp
+*.ropeproject
 *.pyc
 build
+.tox
+isoparser.egg-info
diff --git a/setup.py b/setup.py
index f93c808..ded4ba9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-from distutils.core import setup
+from setuptools import setup
+
 
 setup(
     name='isoparser',
@@ -9,4 +10,6 @@
     license='MIT',
     description='Parser for the ISO 9660 disk image format',
     packages=["isoparser"],
+    install_requires=["six"],
+    test_suite="isoparser.test",
 )
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..4f95d2c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27, py32, py33, py34, py35, pypy, jython
+
+[testenv]
+commands = {envpython} setup.py test
+deps = 
+

From 054126a1bc9afe430d17e18fe0c2388687eb08bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Barci=C5=9B?= <232002@gmail.com>
Date: Tue, 13 Dec 2016 11:16:22 +0100
Subject: [PATCH 2/5] added travis-ci support

---
 .travis.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..b7d16c2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  # PyPy versions
+  - "pypy"
+  - "jython"
+# command to install dependencies
+install:
+  - pip install .
+  - pip install tox-travis
+# command to run tests
+script: tox

From 80dd19a2105f031921feceef79f244fb695e4b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Barci=C5=9B?= <232002@gmail.com>
Date: Tue, 13 Dec 2016 11:21:01 +0100
Subject: [PATCH 3/5] Jython is not working on travis-ci, the project is not
 working on Python 2.6

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

diff --git a/.travis.yml b/.travis.yml
index b7d16c2..c484c1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
@@ -8,7 +7,6 @@ python:
   - "3.5"
   # PyPy versions
   - "pypy"
-  - "jython"
 # command to install dependencies
 install:
   - pip install .
diff --git a/tox.ini b/tox.ini
index 4f95d2c..67d615a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, pypy, jython
+envlist = py27, py32, py33, py34, py35, pypy
 
 [testenv]
 commands = {envpython} setup.py test

From f93db9d1779136ac0afd408761c373e6a4ddc847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Barci=C5=9B?= <232002@gmail.com>
Date: Tue, 13 Dec 2016 11:26:00 +0100
Subject: [PATCH 4/5] added travis-ci icon to README.rst

---
 README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 11412cb..d615bb0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,7 @@
 isoparser
 =========
+.. image:: https://travis-ci.org/zeroos/isoparser.svg?branch=master
+    :target: https://travis-ci.org/zeroos/isoparser
 
 This python library can parse the `ISO 9660`_ disk image format including
 `Rock Ridge`_ extensions. It can load ISOs from the local filesystem or via
@@ -26,4 +28,4 @@ Usage
     print iso.record("boot", "grub", "grub.cfg").content
 
 .. _`ISO 9660`: https://en.wikipedia.org/wiki/ISO_9660
-.. _`Rock Ridge`: https://en.wikipedia.org/wiki/Rock_Ridge
\ No newline at end of file
+.. _`Rock Ridge`: https://en.wikipedia.org/wiki/Rock_Ridge

From 399738715f24ff8e4aabf42e79a632aa1dd120c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Barci=C5=9B?= <232002@gmail.com>
Date: Tue, 13 Dec 2016 11:32:08 +0100
Subject: [PATCH 5/5] changed the travis-ci icon to match the original
 repository

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index d615bb0..f91ad5a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 isoparser
 =========
-.. image:: https://travis-ci.org/zeroos/isoparser.svg?branch=master
-    :target: https://travis-ci.org/zeroos/isoparser
+.. image:: https://travis-ci.org/barneygale/isoparser.svg?branch=master
+    :target: https://travis-ci.org/barneygale/isoparser
 
 This python library can parse the `ISO 9660`_ disk image format including
 `Rock Ridge`_ extensions. It can load ISOs from the local filesystem or via