From 8a64b77e63612bddcdbd50969cfb5eee630ddbc8 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Mon, 16 Aug 2021 19:46:01 -0700 Subject: [PATCH 1/2] Update build to poetry alpha 2 for python 3.10 (#1320) * udpate build to poetry alpha 2 for python 3.10 * update testing workflow to run when workflow itself is changed --- .github/workflows/testing.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index 396fc854..d2ec4039 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -9,6 +9,7 @@ on: - 'tests/**' - 'poetry.lock' - 'pyproject.toml' + - '.github/workflows/testing.yaml' pull_request: branches: [ develop ] paths: @@ -17,6 +18,7 @@ on: - 'tests/**' - 'poetry.lock' - 'pyproject.toml' + - '.github/workflows/testing.yaml' jobs: test: @@ -64,7 +66,7 @@ jobs: if: ${{ matrix.python-version == '3.10-dev' }} run: | echo '::group::poetry' - pip install poetry==1.2.0a1 + pip install poetry==1.2.0a2 poetry config --local virtualenvs.in-project true echo '::endgroup::' From 5ec7dec9f01ca3504f5d99c9a2f9108540ca466b Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Tue, 17 Aug 2021 02:47:47 +0000 Subject: [PATCH 2/2] Update changelog [ci skip] --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef50d24e..5b798f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [Unreleased](https://github.com/jrnl-org/jrnl/) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8.2...HEAD) + +**Implemented enhancements:** + +- Output after composition can be more useful and user friendly [\#1253](https://github.com/jrnl-org/jrnl/issues/1253) + +**Build:** + +- Python 3.10 build action is failing on poetry dependency installation [\#1321](https://github.com/jrnl-org/jrnl/issues/1321) + ## [v2.8.2](https://pypi.org/project/jrnl/v2.8.2/) (2021-07-31) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8.2-beta...v2.8.2)