diff options
| author | Jrnl Bot <jrnl.bot@gmail.com> | 2020-02-01 21:22:57 +0000 |
|---|---|---|
| committer | Jrnl Bot <jrnl.bot@gmail.com> | 2020-04-10 11:51:56 -0700 |
| commit | 4d0a73dab2c49713491b4793cd95c9ff1c4645ee (patch) | |
| tree | 03c74b0761b5a4c99c6954efae487e900e963bed | |
| parent | c3d5878a319c6c26acbba6ab1a13a5087154f620 (diff) | |
Incrementing version to v2.2 [ci skip]v2.2
Update changelog
| -rw-r--r-- | CHANGELOG.md | 14 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c635848..707e1322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,15 +12,9 @@ - Fix all skipped tests on Travis Windows builds by preserving newlines [\#823](https://github.com/jrnl-org/jrnl/pull/823) ([micahellison](https://github.com/micahellison)) -**Updated documentation:** - -- Updating/clarifying template explanation [\#829](https://github.com/jrnl-org/jrnl/pull/829) ([heymajor](https://github.com/heymajor)) +## [v2.2](https://pypi.org/project/jrnl/v2.2/) (2020-02-01) -# Changelog - -## [Unreleased](https://github.com/jrnl-org/jrnl/) - -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.1.1...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2-beta2...v2.2) **Implemented enhancements:** @@ -37,7 +31,8 @@ **Build:** -- Fix all skipped tests on Travis Windows builds by preserving newlines [\#823](https://github.com/jrnl-org/jrnl/pull/823) ([micahellison](https://github.com/micahellison)) +- Fix issue where jrnl would always out 'source' for version, fix Poetry config to build and publish properly [\#820](https://github.com/jrnl-org/jrnl/pull/820) ([wren](https://github.com/wren)) +- Unpin poetry [\#808](https://github.com/jrnl-org/jrnl/pull/808) ([wren](https://github.com/wren)) - Change PyPI auth method in build pipeline [\#807](https://github.com/jrnl-org/jrnl/pull/807) ([wren](https://github.com/wren)) - Automagically update the changelog you see before your very eyes! [\#806](https://github.com/jrnl-org/jrnl/pull/806) ([wren](https://github.com/wren)) - Update Black version and lock file to fix builds on develop branch [\#784](https://github.com/jrnl-org/jrnl/pull/784) ([wren](https://github.com/wren)) @@ -50,6 +45,7 @@ **Updated documentation:** +- Explain how fish can be configured to exclude jrnl commands from history by default [\#809](https://github.com/jrnl-org/jrnl/pull/809) ([aureooms](https://github.com/aureooms)) - Remove merge marker in recipes.md [\#782](https://github.com/jrnl-org/jrnl/pull/782) ([markphelps](https://github.com/markphelps)) - Fix merge conflict left-over [\#767](https://github.com/jrnl-org/jrnl/pull/767) ([thejspr](https://github.com/thejspr)) - Display header in docs on mobile devices [\#763](https://github.com/jrnl-org/jrnl/pull/763) ([maebert](https://github.com/maebert)) diff --git a/pyproject.toml b/pyproject.toml index c4a7e41c..beb98479 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.2-beta2" +version = "v2.2" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert <manuel@1450.me>", |