Merge branch 'upstream_develop' into develop

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 **Fixed bugs:**
 
+- Fix Python 3.9 incompatibility by updating plistlib [\#909](https://github.com/jrnl-org/jrnl/pull/909) ([MinchinWeb](https://github.com/MinchinWeb))
 - Fix typo in YAML exporter \("stared" -\> "starred"\) [\#907](https://github.com/jrnl-org/jrnl/pull/907) ([MinchinWeb](https://github.com/MinchinWeb))
 
 **Build:**

features/regression.feature

@@ -122,3 +122,10 @@ Feature: Zapped bugs should stay dead.
         Then the output should contain "This thing happened yesterday"
         Then the output should contain "Adding an entry right now."
         Then the output should not contain "A future entry."
+
+    @deployment_tests
+    Scenario: Version numbers should stay in sync
+        Given we use the config "basic.yaml"
+        When we run "jrnl --version"
+        Then we should get no error
+        Then the output should contain pyproject.toml version

features/steps/core.py

@@ -19,6 +19,8 @@ import keyring
 import tzlocal
 import shlex
 import sys
+from pathlib import Path
+import toml
 
 consts = pdt.Constants(usePyICU=False)
 consts.DOWParseStyle = -1  # Prefers past weekdays
@@ -207,6 +209,15 @@ def check_output_time_inline(context, text):
     assert output_date in out, output_date
 
 
+@then("the output should contain pyproject.toml version")
+def check_output_version_inline(context):
+    out = context.stdout_capture.getvalue()
+    pyproject = (Path(__file__) / ".." / ".." / ".." / "pyproject.toml").resolve()
+    pyproject_contents = toml.load(pyproject)
+    pyproject_version = pyproject_contents["tool"]["poetry"]["version"]
+    assert pyproject_version in out, pyproject_version
+
+
 @then("the output should contain")
 @then('the output should contain "{text}"')
 @then('the output should contain "{text}" or "{text2}"')

poetry.lock

@@ -522,7 +522,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
 testing = ["jaraco.itertools", "func-timeout"]
 
 [metadata]
-content-hash = "17cf8d4cf5a772217160daf312f590901dea4a3f5545d003035f3fb713a70f07"
+content-hash = "afeb906a1ba51bc9fc4e8c19c0b2c63bb5c9529697c9496d6edb64b509da9e0f"
 python-versions = ">=3.6.0, <3.9.0"
 
 [metadata.files]

pyproject.toml

@@ -35,6 +35,7 @@ behave = "^1.2"
 mkdocs = "^1.0"
 flake8 = "^3.7"
 black = {version = "^19.10b0",allow-prereleases = true}
+toml = "^0.10.0"
 
 [tool.poetry.scripts]
 jrnl = 'jrnl.cli:run'