From 7e4828fdf0f6ed7d53e5d924cbe956249befe312 Mon Sep 17 00:00:00 2001
From: Dan Blanchard <dan.blanchard@gmail.com>
Date: Fri, 14 Dec 2018 17:03:55 -0500
Subject: [PATCH] Simplify Travis setup and requirements (#454)

---
 .travis.yml           | 19 +++++++------------
 dev-requirements.txt  |  4 ----
 requirements.txt      |  4 +++-
 setup.py              | 15 ++++-----------
 test-requirements.txt |  6 +++---
 5 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8d5c24e..c7148e70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,25 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.6-dev"
+  - "3.7"
   - "3.7-dev"
-  - "pypy2.7-5.10.0"
-  - "pypy3.5-5.10.1"
+  - "pypy2.7-6.0"
+  - "pypy3.5-6.0"
 
 matrix:
   fast_finish: true
   allow_failures:
     - python: '3.7-dev'
 
+dist:
+  - xenial
+
 install:
   - travis_retry pip install --upgrade pip setuptools
   - travis_retry pip install -r requirements.txt
   - travis_retry pip install -r test-requirements.txt
-  - travis_retry pip install coveralls coverage nose-cov
-  - echo TRAVIS_PYTHON_VERSION=${TRAVIS_PYTHON_VERSION}
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} != "3" ]; then travis_retry pip install contextlib2; fi
   - python setup.py --version
 
 # Run test
 script:
-  - if [ $TRAVIS_PYTHON_VERSION == "3.4" ]; then nosetests -v --with-cov --cov streamparse --cov-config .coveragerc --logging-level=DEBUG; fi
-  - if [ $TRAVIS_PYTHON_VERSION != "3.4" ]; then nosetests -v --logging-level=DEBUG; fi
-
-# Calculate coverage on success
-after_success:
-  - if [ $TRAVIS_PYTHON_VERSION == "3.4" ]; then coveralls; fi
+  - pytest -vv
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e0f3fecf..483a4e96 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1 @@
-pyflakes
-pep8
-nose
 sphinx_rtd_theme
-mock
diff --git a/requirements.txt b/requirements.txt
index 70f5962d..be33f6a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
-fabric3
+cython
 jinja2
+fabric3
 pystorm>=3.1.1
 requests
 ruamel.yaml
@@ -8,3 +9,4 @@ simplejson
 six>=1.5
 texttable
 thriftpy>=0.3.2
+contextlib2; python_version < '3'
diff --git a/setup.py b/setup.py
index d0e762a5..b5cf0649 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ def readme():
 
 
 install_requires = [
-    "fabric3",
+    "cython",
     "jinja2",
     "requests",
     "texttable",
@@ -43,6 +43,7 @@ def readme():
     "pystorm>=3.1.1",
     "thriftpy>=0.3.2",
     "ruamel.yaml",
+    "fabric3",
 ]
 
 if sys.version_info.major < 3:
@@ -51,14 +52,9 @@ def readme():
 lint_requires = ["pep8", "pyflakes"]
 
 if sys.version_info.major < 3:
-    tests_require = ["graphviz", "mock", "nose", "unittest2"]
+    tests_require = ["graphviz", "mock", "pytest", "unittest2"]
 else:
-    tests_require = ["graphviz", "mock", "nose"]
-
-dependency_links = []
-setup_requires = []
-if "nosetests" in sys.argv[1:]:
-    setup_requires.append("nose")
+    tests_require = ["graphviz", "pytest"]
 
 setup(
     name="streamparse",
@@ -82,15 +78,12 @@ def readme():
     },
     install_requires=install_requires,
     tests_require=tests_require,
-    setup_requires=setup_requires,
     extras_require={
         "test": tests_require,
         "all": install_requires + tests_require,
         "docs": ["sphinx"] + tests_require,
         "lint": lint_requires,
     },
-    dependency_links=dependency_links,
     zip_safe=False,
-    test_suite="nose.collector",
     include_package_data=True,
 )
diff --git a/test-requirements.txt b/test-requirements.txt
index 41f51a55..dc2e14e2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
 graphviz
-mock
-nose
-unittest2
\ No newline at end of file
+mock; python_version < '3'
+unittest2; python_version < '3'
+pytest
\ No newline at end of file