From fc608cd6c837985bbbf487609c57227dd5a2e99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Mon, 9 Sep 2019 21:36:33 +0200
Subject: [PATCH] Change nose to pytest

---
 .travis.yml | 36 ++++++++++++++++++++----------------
 setup.py    | 13 +++++--------
 tox.ini     | 16 ++++++++++++++++
 3 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 0b3b1a0..c16c0e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,30 @@
+sudo: false
 language: python
 
-python:
-  - 3.5
-  - 3.6
-  - 3.7
-  - 3.8-dev
-
-addons:
-  postgresql: "9.6"
-  apt:
-    packages:
-      - postgresql-9.6-postgis-2.4
+install:
+  - pip install tox
 
 before_script:
-  - flake8 tests ogn_test
   - psql -U postgres -c 'CREATE DATABASE ogn_test;'
   - psql -U postgres -c 'CREATE EXTENSION postgis;'
 
 script:
-  - nosetests --with-coverage --cover-package=app
-  - pip install . --upgrade
-  - python -c 'import app'
+  - tox
+
+addons:
+  postgresql: 9.6
+  apt:
+    packages:
+      - postgresql-9.6-postgis-2.4
+
+matrix:
+  include:
+    - python: "3.6"
+      env: TOXENV='py36'
+    - python: "3.7"
+      env: TOXENV='py37'
+    - python: "3.7"
+      env: TOXENV='flake8'
 
 after_success:
-  - coveralls
+  - tox -e codecov
diff --git a/setup.py b/setup.py
index ca97926..aacce9f 100644
--- a/setup.py
+++ b/setup.py
@@ -51,13 +51,10 @@ setup(
         'tqdm==4.36.1',
 	'requests==2.22.0',
     ],
-    extras_require={
-        'dev': [
-            'nose==1.3.7',
-            'coveralls==1.8.2',
-            'flake8==3.7.8',
-            'xmlunittest==0.4.0'
-        ]
-    },
+    test_require=[
+        'pytest==5.0.1',
+        'flake8==1.1.1',
+        'xmlunittest==0.4.0',
+    ],
     zip_safe=False
 )
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..a58b2a2
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,16 @@
+[tox]
+envlist = py36,py37,flake8
+
+[testenv]
+setenv = OGN_CONFIG_MODULE = 'config/test.py'
+deps = pytest
+    
+commands =
+    pytest
+
+[testenv:flake8]
+deps = 
+    flake8
+
+commands =
+    flake8 app tests