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

See #739 (Python 3.8), #619 (Windows)
---
 .travis.yml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1f35e61e..7efc4fd3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,33 @@
 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.8 on Linux"
+      python: 3.8
+    - name: "Python, developmental version, 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
+    - name: "Python 3.8.0 on Windows"
+      os: windows
+      langage: shell       # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python --version 3.8.0
+        - python -m pip install --upgrade pip
+  allow_failures:
+    - python: 3.8
+    - python: nightly
 git:
   depth: false
-before_install:
-  - pip install poetry~=0.12.17
+cache: pip
 install:
+  - pip install poetry~=0.12.17
   # we run `poetry version` here to appease poetry about '0.0.0-source'
   - poetry version
   - poetry install

From b0f07eeb5981253cbdaefba7eb55fbb2d9d3e232 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 07:49:33 -0700
Subject: [PATCH 2/7] Appease the Travis gods

---
 .travis.yml    | 9 ++++++---
 pyproject.toml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7efc4fd3d..eac6f3f2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 dist: xenial   # required for Python >= 3.7
-language: python
 jobs:
   include:
     - name: "Python 3.6 on Linux"
@@ -8,26 +7,30 @@ jobs:
       python: 3.7
     - name: "Python 3.8 on Linux"
       python: 3.8
-    - name: "Python, developmental version, on Linux"
+    - 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
     - name: "Python 3.8.0 on Windows"
       os: windows
       langage: shell       # 'language: python' is an error on Travis CI Windows
       before_install:
         - choco install python --version 3.8.0
         - python -m pip install --upgrade pip
+        - pip install poetry~=0.12.17
   allow_failures:
     - python: 3.8
     - python: nightly
 git:
   depth: false
 cache: pip
-install:
+before_install:
   - pip install poetry~=0.12.17
+install:
   # we run `poetry version` here to appease poetry about '0.0.0-source'
   - poetry version
   - poetry install
diff --git a/pyproject.toml b/pyproject.toml
index 70a44402b..136aeb977 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"

From 3c2ced098915ad31a2acd2af3315017b9575fb12 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 07:59:06 -0700
Subject: [PATCH 3/7] [Travis] no auto-ruby

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index eac6f3f2a..22241a4d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,16 @@ dist: xenial   # required for Python >= 3.7
 jobs:
   include:
     - name: "Python 3.6 on Linux"
+      language: python
       python: 3.6
     - name: "Python 3.7 on Linux"
+      language: python
       python: 3.7
     - name: "Python 3.8 on Linux"
+      language: python
       python: 3.8
     - name: "Python dev on Linux"
+      language: python
       python: nightly
     - name: "Python 3.7.4 on MacOS"
       os: osx

From cdad3230f023ed6df6c29f21c7b5d92d2a8cb9f1 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 08:21:01 -0700
Subject: [PATCH 4/7] [Travis] include a test in not UTC

see #742
---
 .travis.yml            | 17 ++++++++++-------
 features/steps/core.py |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 22241a4d9..19fa4084e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,31 @@
 dist: xenial   # required for Python >= 3.7
+language: python
 jobs:
   include:
     - name: "Python 3.6 on Linux"
-      language: python
       python: 3.6
     - name: "Python 3.7 on Linux"
-      language: python
       python: 3.7
+    - name: "Python 3.7 on Linux, not UTC"
+      python: 3.7
+      env:
+        - TZ=America/Edmonton
     - name: "Python 3.8 on Linux"
-      language: python
       python: 3.8
     - name: "Python dev on Linux"
-      language: python
       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
+        - pip3 install poetry~=0.12.17  # 'pip' points to Python 2 on MacOS
     - name: "Python 3.8.0 on Windows"
       os: windows
-      langage: shell       # 'language: python' is an error on Travis CI Windows
+      language: shell       # 'language: python' is an error on Travis CI Windows
       before_install:
         - choco install python --version 3.8.0
+        - refreshenv  # add Python to PATH
         - python -m pip install --upgrade pip
         - pip install poetry~=0.12.17
   allow_failures:
@@ -33,13 +35,14 @@ 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 314a5167a..5e8e3ea3e 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')

From 9cad7ddb5110b3debbd7f237335664ca0d2ebcee Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 08:39:22 -0700
Subject: [PATCH 5/7] [Travis] Add Python to PATH on Windows

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 19fa4084e..e8278da21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,10 @@ jobs:
       language: shell       # 'language: python' is an error on Travis CI Windows
       before_install:
         - choco install python --version 3.8.0
-        - refreshenv  # add Python to PATH
         - python -m pip install --upgrade pip
         - pip install poetry~=0.12.17
+      env:
+        - PATH=/c/Python38:/c/Python38/Scripts:$PATH
   allow_failures:
     - python: 3.8
     - python: nightly

From 34f7d9830f3aff457336b686f174e2685585fc94 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 08:50:06 -0700
Subject: [PATCH 6/7] [Travis] Windows: try Python 3.7 for cryptography wheels?

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8278da21..5f020fc1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,15 +20,16 @@ jobs:
       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.8.0 on Windows"
+    - 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.8.0
+        - choco install python --version 3.7.5
         - python -m pip install --upgrade pip
+        - pip --version
         - pip install poetry~=0.12.17
       env:
-        - PATH=/c/Python38:/c/Python38/Scripts:$PATH
+        - PATH=/c/Python37:/c/Python37/Scripts:$PATH
   allow_failures:
     - python: 3.8
     - python: nightly

From ae505dcbbda63dc07891d116d447230265451248 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 28 Nov 2019 09:14:50 -0700
Subject: [PATCH 7/7] [Travis] Windows tests time out

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 5f020fc1b..297ce340d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ jobs:
   allow_failures:
     - python: 3.8
     - python: nightly
+    - os: windows
 git:
   depth: false
 cache: pip