From b522f761eed1210fc1cc31c84a3b3b2e4c5ce98f Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Wed, 15 Jan 2020 06:33:18 +0000 Subject: [PATCH 01/14] Updating changelog [ci skip] --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5b4a5f..45cb7a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ - Reduce startup time by 55% [\#719](https://github.com/jrnl-org/jrnl/pull/719) ([maebert](https://github.com/maebert)) - Refactor password logic to prevent accidental password leakage [\#708](https://github.com/jrnl-org/jrnl/pull/708) ([pspeter](https://github.com/pspeter)) - Password confirmation [\#706](https://github.com/jrnl-org/jrnl/pull/706) ([pspeter](https://github.com/pspeter)) +- Pretty print journal entries [\#692](https://github.com/jrnl-org/jrnl/pull/692) ([alichtman](https://github.com/alichtman)) **Build:** +- 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)) - Run black formatter on codebase for standardization [\#778](https://github.com/jrnl-org/jrnl/pull/778) ([wren](https://github.com/wren)) From fd591b82a357a1bbbf62646dca738c2f729640bf Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Tue, 14 Jan 2020 22:58:36 -0800 Subject: [PATCH 02/14] unpin poetry version in requirments --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37dab626..50f088c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - date install: - - pip install poetry~=0.12.17 + - pip install poetry - poetry install - poetry run python --version From 2433363ca8773ce60580df00403bfc98b6132cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Ooms?= Date: Thu, 16 Jan 2020 14:51:22 +0100 Subject: [PATCH 03/14] Explain how fish can be configured to exclude jrnl commands from history by default --- docs/encryption.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/encryption.md b/docs/encryption.md index 2cb5d547..35a26313 100644 --- a/docs/encryption.md +++ b/docs/encryption.md @@ -56,10 +56,14 @@ setopt HIST_IGNORE_SPACE alias jrnl=" jrnl" ``` -The fish shell does not support automatically preventing logging like -this. To prevent `jrnl` commands being logged by fish, you must make -sure to type a space before every `jrnl` command you enter. To delete -existing `jrnl` commands from fish’s history, run +If you are using `fish` instead of `bash` or `zsh`, you can get the same behaviour by +adding this to your `fish` configuration: + +``` sh +abbr jrnl=" jrnl" +``` + +To delete existing `jrnl` commands from `fish`’s history, run `history delete --prefix 'jrnl '`. ## Manual decryption From a753f53f5427931752577fbdc4af89860197a6f6 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Jan 2020 11:47:52 -0800 Subject: [PATCH 04/14] add version file to repo --- .gitignore | 1 - jrnl/__version__.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 jrnl/__version__.py diff --git a/.gitignore b/.gitignore index a06808df..2382cabe 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,3 @@ exp/ _extras/ *.sublime-* site/ -jrnl/__version__.py diff --git a/jrnl/__version__.py b/jrnl/__version__.py new file mode 100644 index 00000000..4bf5d5ff --- /dev/null +++ b/jrnl/__version__.py @@ -0,0 +1 @@ +__version__ = "v2.2-beta" From c88457f9ff58946bf9f4dc9e7dedf14860f13956 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Jan 2020 11:52:47 -0800 Subject: [PATCH 05/14] fix poetry warning --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b5c2a6b1..284da2ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ pyyaml = "^5.1" behave = "^1.2" mkdocs = "^1.0" flake8 = "^3.7" -black = {version = "^19.10b0",allows-prereleases = true} +black = {version = "^19.10b0",allow-prereleases = true} [tool.poetry.scripts] jrnl = 'jrnl.cli:run' From f10cb4d4f89ac6f4ff4e42e8258c9926542e2764 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Jan 2020 12:13:54 -0800 Subject: [PATCH 06/14] add maintainer field to config --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 284da2ba..c53a175c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,9 @@ authors = [ "Jonathan Wren ", "Micah Ellison " ] +maintainers = [ + "Jonathan Wren and Micah Ellison ", +] license = "MIT" readme = "README.md" homepage = "https://jrnl.sh" From 879733a59f5b91c37ddf96c1be88dbdeb10e7cdb Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Jan 2020 12:14:09 -0800 Subject: [PATCH 07/14] update poetry version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c53a175c..bc557beb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.1.1" +version = "v2.2-beta" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ", From 932a5b6cc33db9834b365e615ceb97b39b1924ec Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 25 Jan 2020 22:12:27 +0000 Subject: [PATCH 08/14] Updating changelog [ci skip] --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93055ede..de50e8c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ - Reduce startup time by 55% [\#719](https://github.com/jrnl-org/jrnl/pull/719) ([maebert](https://github.com/maebert)) - Refactor password logic to prevent accidental password leakage [\#708](https://github.com/jrnl-org/jrnl/pull/708) ([pspeter](https://github.com/pspeter)) - Password confirmation [\#706](https://github.com/jrnl-org/jrnl/pull/706) ([pspeter](https://github.com/pspeter)) -- Pretty print journal entries [\#692](https://github.com/jrnl-org/jrnl/pull/692) ([alichtman](https://github.com/alichtman)) **Fixed bugs:** From 9383c6cda3c6a31d196ab2634d141d98c8e2ca21 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 25 Jan 2020 22:13:51 +0000 Subject: [PATCH 09/14] Incrementing version to v2.2-beta2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bc557beb..c4a7e41c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.2-beta" +version = "v2.2-beta2" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ", From 0efd78cf3c6af1f8bc844cbc95095609ae05255d Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 1 Feb 2020 21:22:57 +0000 Subject: [PATCH 10/14] Updating changelog [ci skip] --- CHANGELOG.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de50e8c7..f86d2325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,19 @@ ## [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...HEAD) + +**Implemented enhancements:** + +- Update YAML exporter to handle Dayone format [\#773](https://github.com/jrnl-org/jrnl/pull/773) ([MinchinWeb](https://github.com/MinchinWeb)) + +**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)) + +## [v2.2](https://pypi.org/project/jrnl/v2.2/) (2020-02-01) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2-beta2...v2.2) **Implemented enhancements:** @@ -18,6 +30,8 @@ **Build:** +- 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)) @@ -30,6 +44,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)) From c4f7d481bd84b021b7f5b1d1164ddea284a27f47 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 1 Feb 2020 21:24:21 +0000 Subject: [PATCH 11/14] Incrementing version to v2.2 [ci skip] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ", From 57e39b592f5ca56763b555130a3d6ef5d9342e0d Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 1 Feb 2020 14:51:19 -0800 Subject: [PATCH 12/14] Take out build system from pyproject config #781 We don't use it, and it breaks the homebrew install. --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index beb98479..e1dfcfbd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,3 @@ black = {version = "^19.10b0",allow-prereleases = true} [tool.poetry.scripts] jrnl = 'jrnl.cli:run' -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" - From f40e0de4b9efbfeaf876beb0535df75f4c088dc7 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Thu, 6 Feb 2020 06:27:18 +0000 Subject: [PATCH 13/14] Updating changelog [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86d2325..28f147b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ - 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) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2-beta2...v2.2) From b747de42f64de7ed40c9f72e4f3f7db37eb98b98 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Thu, 6 Feb 2020 06:28:47 +0000 Subject: [PATCH 14/14] Incrementing version to v2.2.1-beta2 [ci skip] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e1dfcfbd..9dc76df4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.2" +version = "v2.2.1-beta2" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ",