From 8484a89b89a4946dd081ae5c1ce738cc9f2b2043 Mon Sep 17 00:00:00 2001
From: Abhas Bhattacharya <abhasbhattacharya2@gmail.com>
Date: Thu, 14 Jan 2016 02:50:59 +0530
Subject: [PATCH] Add tox.ini, remove funcsigs, fix setup.py adding submodule
 names and update docs, update travis for using tox

---
 .travis.yml                           | 38 ++++++++++++---------------
 pytest_gui_status/status_gui/todo.txt |  3 ++-
 requirements.txt                      |  1 -
 setup.py                              |  8 +++---
 tox.ini                               | 11 ++++++++
 5 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index efb3dbc..16001ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,26 @@
 language: python
-# cache: pip
 
 addons:
   apt:
     packages:
     - redis-server
 
-python:
-  # major versions, test first
-  - "2.7"
-  - "3.5-dev"
-  # other versions
-  - "2.6"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "nightly"
-  - "pypy"
-  # not included, for incompatibility
-  # - "2.5" # tarvis errs
-  # - "3.2" # humanfriendly cant install
-  # - "pypy3" # psutil errs
-
-install: 
-  - "pip install --upgrade -r requirements.txt"     
-  - "pip install ."
+  env:
+    matrix:
+      # major versions, test first
+      - TOXENV=py27
+      - TOXENV=py35
+      # other versions
+      - TOXENV=py26
+      - TOXENV=py33
+      - TOXENV=py34
+      - TOXENV=py35
+      - TOXENV=pypy
+      - TOXENV=pypy3
+      # not included, for incompatibility
+      # - "2.5" # tarvis errs
+      # - "3.2" # humanfriendly cant install
+      # - "pypy3" # psutil errs
 
 # command to run tests
-script: py.test -v
+script: tox
diff --git a/pytest_gui_status/status_gui/todo.txt b/pytest_gui_status/status_gui/todo.txt
index aa28faf..92fff2a 100644
--- a/pytest_gui_status/status_gui/todo.txt
+++ b/pytest_gui_status/status_gui/todo.txt
@@ -1,7 +1,8 @@
 Todo
 ------
 
-1. Test on Appveyor - install redis via chocolatey
+1. Test on Appveyor - python 2.x builds don't stop - use tox
+1.1. Use tox for wrapping around py.test
 2. Release on pypi
 3. Add well-explained readme
 4. use logging.debug / log file for more prints
diff --git a/requirements.txt b/requirements.txt
index df1bbb2..d1b6d05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,5 +7,4 @@ python-dateutil
 humanfriendly
 psutil
 setuptools
-funcsigs
 mock
diff --git a/setup.py b/setup.py
index 0e9a121..327ee12 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,13 @@ from setuptools import setup
 
 packages = [
     "pytest_gui_status",
-    # 'pytest_gui_status.plugin',
-    # 'pytest_gui_status.gui',
+    'pytest_gui_status.status_plugin',
+    'pytest_gui_status.status_gui',
 ]
 package_dir = {
     'pytest_gui_status': 'pytest_gui_status',
-    # 'pytest_gui_status.plugin': 'status_plugin',
-    # 'pytest_gui_status.gui': 'status_gui',
+    # 'pytest_gui_status.status_plugin': 'status_plugin',
+    # 'pytest_gui_status.status_gui': 'status_gui',
 }
 
 setup(
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..9b4406b
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+skipsdist = true
+envlist = py{26,27,34,35}
+
+[testenv]
+passenv = PYTEST_STATUS_PORT
+        REDIS_PATH
+        REDIS_ARGS
+
+commands = pip install .
+        py.test -v