Merge branch 'master' into develop

* master: Add GitHub actions Upgrade PyYAML to fix installation on newer Python versions
doorstop-dev · Oct 7, 2023 · 705ec48 · 705ec48
2 parents 3e5c976 + 07ef4d2
commit 705ec48
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 119 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+python 3.8.13
+poetry 1.6.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Added support for publishing to the LaTeX format. ([@neerdoc](https://github.com/doorstop-dev/doorstop/pull/545))
 - Added support for storing items in Markdown with YAML front matter. ([@ckolumbus](https://github.com/doorstop-dev/doorstop/pull/566))
 
+# 2.2.1 (2023-10-07)
+
+- Upgrade PyYAML to 6.x to fix installation on newer versions of Python.
+
 # 2.2 (2022-01-22)
 
 - Added support for UTF-8 symbols in references. ([@stanislaw](https://github.com/doorstop-dev/doorstop/pull/485))

diff --git a/Makefile b/Makefile
@@ -46,6 +46,7 @@ DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetr
 install: $(DEPENDENCIES) .cache
 
 $(DEPENDENCIES): poetry.lock
+ @ rm -rf ~/Library/Preferences/pypoetry
  @ poetry config virtualenvs.in-project true
  poetry install
  @ touch $@

diff --git a/doorstop/core/tests/files/published.html b/doorstop/core/tests/files/published.html
diff --git a/doorstop/core/tests/files/published2.html b/doorstop/core/tests/files/published2.html