From 2aca0a81837893745a156b6d2d877234d8ed76db Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Thu, 20 Aug 2020 00:42:36 +0200
Subject: [PATCH] update tox config

---
 .travis.yml      | 13 ++++++++++---
 setup.py         |  2 +-
 test/conftest.py |  2 +-
 tox.ini          | 40 ++++++++++++++++++----------------------
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fde3108c..85584d17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,19 @@ addons:
       - slapd
 
 matrix:
+  allow_failures:
+    - env: TOXENV=py37-pytest
+    - env: TOXENV=py37-lint
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-pytest
     - python: 2.7
-      env: TOXENV=lint
-    - python: 3.6
+      env: TOXENV=py27-lint
+    - python: 3.7
+      env: TOXENV=py37-pytest
+    - python: 3.7
+      env: TOXENV=py37-lint
+    - python: 3.7
       env: TOXENV=format-check
     - python: 2.7
       env: TOXENV=docs
diff --git a/setup.py b/setup.py
index b8d8024f..736ad010 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(name='Moulinette',
       license='AGPL',
       packages=find_packages(exclude=['test']),
       data_files=[(LOCALES_DIR, locale_files)],
-      python_requires='==2.7.*',
+      python_requires='>=2.7.*',
       install_requires=[
           'argcomplete',
           'psutil',
diff --git a/test/conftest.py b/test/conftest.py
index 6df66806..94f5f64f 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -7,7 +7,7 @@ import os
 import shutil
 import pytest
 
-from src.ldap_server import LDAPServer
+from .src.ldap_server import LDAPServer
 
 
 def patch_init(moulinette):
diff --git a/tox.ini b/tox.ini
index dc175f71..fdb9e211 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-envlist = 
-  py27
-  lint
+envlist =
+  py{27,3}-{pytest,lint}
+  format
+  format-check
   docs
 skipdist = True
 
@@ -9,26 +10,21 @@ skipdist = True
 usedevelop = True
 passenv = *
 deps =
-  pytest >= 4.6.3, < 5.0
-  pytest-cov >= 2.7.1, < 3.0
-  pytest-mock >= 1.10.4, < 2.0
-  pytest-env >= 0.6.2, < 1.0
-  requests >= 2.22.0, < 3.0
-  requests-mock >= 1.6.0, < 2.0
-  toml >= 0.10, < 0.11
-  gevent-websocket
-  bottle >= 0.12
-  WebTest >= 2.0, < 2.1
-  python-ldap >= 3.1.0
+  py{27,3}-pytest: pytest >= 4.6.3, < 5.0
+    pytest-cov >= 2.7.1, < 3.0
+    pytest-mock >= 1.10.4, < 2.0
+    pytest-env >= 0.6.2, < 1.0
+    requests >= 2.22.0, < 3.0
+    requests-mock >= 1.6.0, < 2.0
+    toml >= 0.10, < 0.11
+    gevent-websocket
+    bottle >= 0.12
+    WebTest >= 2.0, < 2.1
+    python-ldap >= 3.1.0
+  py{27,3}-lint: flake8
 commands =
-    pytest {posargs}
-
-[testenv:lint]
-commands = flake8 moulinette test
-deps = flake8
-skip_install = True
-usedevelop = False
-
+    py{27,3}-pytest: pytest {posargs} -c pytest.ini
+    py{27,3}-lint: flake8 moulinette test
 
 [testenv:format]
 basepython = python3