From 6bdb18cb0fe62acb0716cc89e7746914667ce29e Mon Sep 17 00:00:00 2001
From: Solvik Blum <solvik.blum@dailymotion.com>
Date: Mon, 12 Aug 2019 10:50:30 +0200
Subject: [PATCH] update

---
 .travis.yml | 40 +++++++++++++++++++++++++++++++---------
 tox.ini     | 50 ++++++++++----------------------------------------
 2 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d270c1..5136b86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,35 @@
+sudo: false
+dist: xenial
 language: python
-python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "pypy3"
-# command to install dependencies
+
+matrix:
+    include:
+        - python: 3.5
+          env: TOXENV=py35
+        - python: 3.6
+          env: TOXENV=py36
+        - python: 3.7
+          env: TOXENV=py37
+        - python: pypy3
+          env: TOXENV=pypy3
+        - python: 3.5
+          env: TOXENV=pep8
+        - python: 3.7
+          env: TOXENV=pep8
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
 install:
-  - pip install -r requirements.txt
-  - pip install tox-travis
-# command to run tests
+  - pip install tox
+  - if [[ $TOXENV == py* ]]; then pip install coveralls; fi
+
 script:
   - tox
+
+notifications:
+  email: false
+
+after_success:
+  - if [[ $TOXENV == py* ]]; then coveralls; fi
diff --git a/tox.ini b/tox.ini
index 65491a0..1fdf25a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ envlist =
     mypy
     pep8
     docs
-skip_missing_interpreters = true
+skip_missing_interpreters = True
 
 [flake8]
 # Use the more relaxed max line length permitted in PEP8.
@@ -23,47 +23,17 @@ import-order-style = google
 application-import-names = netbox_agent
 
 [testenv]
-setenv =
-    COVERAGE_FILE = .coverage.{envname}
+# This is required in order to get UTF-8 output inside of the subprocesses
+# that our tests use.
+setenv = LC_CTYPE = en_US.UTF-8
+# Pass Display down to have it for the tests available
+passenv = DISPLAY TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+whitelist_externals=convert
 deps =
     -r{toxinidir}/requirements.txt
-#     -r{toxinidir}/dev-requirements.txt
-# commands =
-#     # Use -bb to enable BytesWarnings as error to catch str/bytes misuse.
-#     # Use -Werror to treat warnings as errors.
-#     #   Must ignore a DeprecationWarnings triggered in pytest until the following are fixed:
-#     #       https://github.com/pytest-dev/pytest/issues/1403
-#     #       https://github.com/pytest-dev/pytest/issues/4507
-#     #   Must ignore DeprecationWarnings in virtualenv site.py only if supporting Travis CI
-#     #   Python 3.5 environments that bundle an older version of virtualenv.
-#     python -bb \
-#	-Werror -Wignore:::_pytest.assertion.rewrite -Wignore:::_pytest.tmpdir -Wignore:::site \
-#	-m pytest --cov="{envsitepackagesdir}/fact"
-
-# [testenv:coverage]
-# skip_install = true
-# depends = py35,py36,py37
-# # Set blank setenv to overwrite setenv from [testenv] (inherited).
-# setenv =
-# deps =
-#     -r{toxinidir}/dev-requirements.txt
-# commands =
-#     coverage combine
-#     coverage html
-
-# [testenv:mypy]
-# skip_install = true
-# setenv =
-# deps =
-#     -r{toxinidir}/requirements.txt
-#     -r{toxinidir}/dev-requirements.txt
-# commands =
-#     mypy src
 
 [testenv:pep8]
-skip_install = true
-setenv =
 deps =
-    -r{toxinidir}/dev-requirements.txt
-commands =
-    flake8 netbox_agent tests
+    flake8
+    pep8-naming
+commands = flake8 {toxinidir}/netbox_agent {toxinidir}/tests