From 70c946bc13f7d6b1b1e78cf1f656c94708488651 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 07:43:05 -0700
Subject: [PATCH] [Travis] add testing on Windows and Mac

See #739 (Python 3.8), #619 (Windows)
Appease the Travis gods
[Travis] no auto-ruby
[Travis] include a test in not UTC
see #742
[Travis] Add Python to PATH on Windows
[Travis] Windows: try Python 3.7 for cryptography wheels?
[Travis] Windows tests time out
---
 .travis.yml            | 41 +++++++++++++++++++++++++++++++++++++----
 features/steps/core.py |  2 +-
 pyproject.toml         |  2 +-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1f35e61..297ce340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,51 @@
 dist: xenial   # required for Python >= 3.7
 language: python
-python:
-  - 3.6
-  - 3.7
+jobs:
+  include:
+    - name: "Python 3.6 on Linux"
+      python: 3.6
+    - name: "Python 3.7 on Linux"
+      python: 3.7
+    - name: "Python 3.7 on Linux, not UTC"
+      python: 3.7
+      env:
+        - TZ=America/Edmonton
+    - name: "Python 3.8 on Linux"
+      python: 3.8
+    - name: "Python dev on Linux"
+      python: nightly
+    - name: "Python 3.7.4 on MacOS"
+      os: osx
+      osx_image: xcode11.2  # Python 3.7.4 running on macOS 10.14.4
+      language: shell       # 'language: python' is an error on Travis CI macOS
+      before_install:
+        - pip3 install poetry~=0.12.17  # 'pip' points to Python 2 on MacOS
+    - name: "Python 3.7.5 on Windows"
+      os: windows
+      language: shell       # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python --version 3.7.5
+        - python -m pip install --upgrade pip
+        - pip --version
+        - pip install poetry~=0.12.17
+      env:
+        - PATH=/c/Python37:/c/Python37/Scripts:$PATH
+  allow_failures:
+    - python: 3.8
+    - python: nightly
+    - os: windows
 git:
   depth: false
+cache: pip
 before_install:
+  - date
   - pip install poetry~=0.12.17
 install:
   # we run `poetry version` here to appease poetry about '0.0.0-source'
   - poetry version
   - poetry install
-script:
   - poetry run python --version
+script:
   - poetry run behave
 before_deploy:
   - poetry config http-basic.pypi $PYPI_USER $PYPI_PASS
diff --git a/features/steps/core.py b/features/steps/core.py
index 314a5167..5e8e3ea3 100644
--- a/features/steps/core.py
+++ b/features/steps/core.py
@@ -164,7 +164,7 @@ def has_error(context):
 
 @then('we should get no error')
 def no_error(context):
-    assert context.exit_status is 0, context.exit_status
+    assert context.exit_status == 0, context.exit_status
 
 
 @then('the output should be parsable as json')
diff --git a/pyproject.toml b/pyproject.toml
index 70a44402..136aeb97 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ homepage = "https://jrnl.sh"
 repository = "https://github.com/jrnl-org/jrnl"
 
 [tool.poetry.dependencies]
-python = ">=3.6.0, <3.8.0"
+python = ">=3.6.0, <3.9.0"
 pyxdg = "^0.26.0"
 cryptography = "^2.7"
 passlib = "^1.7"