Switch to tox for testing

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 # Ignoring W503, because it is difficult to make pretty equations
 ignore = D203, W503
-exclude = .git,__pycache__,docs/source/conf.py,old,build,dist
+exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,.tox
 max-line-length = 120

.travis.yml

@@ -4,36 +4,53 @@ matrix:
     - name: "Python 3.8.0 on Xenial Linux"
       python: 3.8         # this works for Linux but is ignored on macOS or Windows
       dist: xenial
+      env:
+        - TOXENV=py38
+        - RELEASE=yes
     - name: "Python 3.7.1 on Xenial Linux"
       python: 3.7           # this works for Linux but is ignored on macOS or Windows
       dist: xenial          # required for Python >= 3.7
+      env:
+        - TOXENV=py37
+        - RELEASE=yes
       before_script:
+        - pip3 install flake8
         - flake8 readlif
     - name: "Python 3.6.7 on Xenial Linux"
       python: 3.6           # this works for Linux but is ignored on macOS or Windows
       dist: xenial          # required for Python >= 3.7
+      env:
+        - TOXENV=py36
+        - RELEASE=yes
     - name: "Pypy 3.5 on Xenial Linux"
       python: "pypy3"       # this works for Linux but is ignored on macOS or Windows
       dist: xenial          # required for Python >= 3.7
+      env: TOXENV=pypy3
     - name: "Python 3.7.2 on macOS"
       os: osx
       osx_image: xcode10.2  # Python 3.7.2 running on macOS 10.14.3
       language: shell       # 'language: python' is an error on Travis CI macOS
+      env: TOXENV=py37
     - name: "Python 3.7.2 on Windows"
       os: windows           # Windows 10.0.17134 N/A Build 17134
       language: shell       # 'language: python' is an error on Travis CI Windows
       before_install:
         - choco install python --version 3.7.2
-        - python -m pip install --upgrade pip
-        - python -m pip install --user unittest2
-      env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
+      env:
+        - PATH=/c/Python37:/c/Python37/Scripts:$PATH
+        - TOXENV=py37
+    - name: "Python 3.8.0 on Windows"
+      os: windows           # Windows 10.0.17134 N/A Build 17134
+      language: shell       # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python --version 3.8.0
+      env:
+        - PATH=/c/Python38:/c/Python38/Scripts:$PATH
+        - TOXENV=py38
 install:
-  - pip3 install --upgrade pip  # all three OSes agree about 'pip3'
-  - pip3 install unittest2
-  - pip3 install flake8
-# 'python' points to Python 2.7 on macOS but points to Python 3.7 on Linux and Windows
-# 'python3' is a 'command not found' error on Windows but 'py' works on Windows only
-script: python3 setup.py test || python setup.py test
+  - pip3 install tox
+
+script: tox
 
 deploy:
   provider: pypi
@@ -43,4 +60,5 @@ deploy:
   distributions: "sdist bdist_wheel"
   skip_existing: true
   on:
-    tags: true
+    tags: true
+    condition: $RELEASE = yes

readlif/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.2.1-dev"

setup.py

@@ -9,7 +9,7 @@
 # This call to setup() does all the work
 setup(
     name="readlif",
-    version="0.2.1",
+    version="0.2.1-dev",
     description="Fast Leica LIF file reader written in python",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -20,10 +20,8 @@
     classifiers=[
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
     ],
     packages=["readlif"],
     include_package_data=True,
-    install_requires=["Pillow>=4.2.0"],
-    test_suite="unittest2.collector",
+    install_requires=["Pillow>=4.2.0"]
 )

tox.ini

@@ -0,0 +1,21 @@
+[tox]
+envlist =
+    py{36,37,38,py3}
+
+skip_missing_interpreters = {tty:True:False}
+
+[testenv]
+
+description = run tests
+
+basepython =
+    py36: python3.6
+    py37: python3.7
+    py38: python3.8
+    pypy3: pypy3
+
+deps =
+    -r requirements.txt
+    discover
+
+commands = python -m discover