fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-18 12:08:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into directory-journal-import

Browse source
This commit is contained in:
Micah Jerome Ellison 2021-08-16 19:50:41 -07:00
commit 678dfa3345
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/testing.yaml vendored
View file

@ -9,6 +9,7 @@ on:
- 'tests/**' - 'tests/**'
- 'poetry.lock' - 'poetry.lock'
- 'pyproject.toml' - 'pyproject.toml'
- '.github/workflows/testing.yaml'
pull_request: pull_request:
branches: [ develop ] branches: [ develop ]
paths: paths:
@ -17,6 +18,7 @@ on:
- 'tests/**' - 'tests/**'
- 'poetry.lock' - 'poetry.lock'
- 'pyproject.toml' - 'pyproject.toml'
- '.github/workflows/testing.yaml'
jobs: jobs:
test: test:
@ -64,7 +66,7 @@ jobs:
if: ${{ matrix.python-version == '3.10-dev' }} if: ${{ matrix.python-version == '3.10-dev' }}
run: | run: |
echo '::group::poetry' echo '::group::poetry'
pip install poetry==1.2.0a1 pip install poetry==1.2.0a2
poetry config --local virtualenvs.in-project true poetry config --local virtualenvs.in-project true
echo '::endgroup::' echo '::endgroup::'

12
CHANGELOG.md
View file

@ -1,5 +1,17 @@
# Changelog # 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) ## [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) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8.2-beta...v2.8.2)