Merge branch 'master' of https://github.com/hapi-server/client-python

Author: rweigel

.travis.yml

@@ -1,11 +1,54 @@
-language: bash
-
-os:
-  - linux
-  - osx
-  - windows
+language: python
+jobs:
+  include:
+    - name: "Python 2.7 on Linux"
+      os: linux
+      before_install:
+        - sudo apt update
+        - sudo apt install python2.7 python-pip
+        - sudo pip install tox
+    - name: "Python 3.8 on Linux"
+      os: linux
+      dist: xenial
+      language: python
+      python: 3.8
+      before_install:
+        - sudo rm /usr/bin/python
+        - sudo ln -s /usr/bin/python3 /usr/bin/python
+        - python3 -m pip install tox-travis
+    - name: "Python 2.7 on macOS"
+      os: osx
+      osx_image: xcode11.2
+      language: shell
+      before_install:
+        - sudo pip install tox-travis
+    - name: "Python 3.8 on macOS"
+      os: osx
+      osx_image: xcode11.6  # Python 3.8.0 running on macOS 10.14.6
+      language: shell        # 'language: python' is an error on Travis CI macOS
+      before_install:
+        - python3 --version
+        - python3 -m pip install --upgrade pip
+        - sudo pip install tox-travis
+    - name: "Python 2.7 on Windows"
+      os: windows           # Windows 10.0.17134 N/A Build 17134
+      language: shell # 'language: python' errors Travis CI Windows
+      before_install:
+        - choco install python2
+        - python --version
+        - python -m pip install --upgrade pip
+        - pip install tox-travis
+      env: PATH=/c/Python27:/c/Python27/Scripts:$PATH
+    - name: "Python 3.8 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.8
+        - python --version
+        - python -m pip install --upgrade pip
+        - python -m pip install tox-travis
+      env: PATH=/c/Python38:/c/Python38/Scripts:$PATH
 
+install: pip install --upgrade pip
 script:
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y miniconda3; fi
-  - make repository-test-all
+  - tox -e short-test

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/hapi-server/client-python.svg?branch=master)](https://travis-ci.org/hapi-server/client-python)
+
 **HAPI Client for Python**
 
 # Installation

tox.ini

@@ -0,0 +1,24 @@
+
+[tox]
+envlist = py27,py38
+skip_missing_interpreters = true
+[testenv:repo-test]
+commands =
+  pip install pytest deepdiff
+
+[testenv:long-test]
+deps =
+    pytest
+    deepdiff
+commands =
+  python -m pytest -v -m 'long' hapiclient/test/test_hapi.py
+
+[testenv:short-test]
+deps =
+    pytest
+    deepdiff
+commands =
+  python -m pytest -v -m 'short' hapiclient/test/test_hapi.py
+  python -m pytest -v hapiclient/test/test_chunking.py
+  python -m pytest -v hapiclient/test/test_hapitime2datetime.py
+  python -m pytest -v hapiclient/test/test_hapitime_reformat.py