From 870c325e3c247cdec5aa61cdaa5ecbeb1aec1f64 Mon Sep 17 00:00:00 2001 From: MinchinWeb Date: Sat, 2 May 2020 13:06:23 -0600 Subject: [PATCH 1/4] GitHub Pull Request Template Update (#927) * Improve GitHub PR Template * suggest running commands with `poetry run ...` pyflakes here is given only certain subdirectories because `.` will try and run across all packages installed in the virtual environment, if the virtual environment is within the project's root folder (which is my common practice). --- .github/PULL_REQUEST_TEMPLATE.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 986f10ee..49533409 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,8 @@ + + ### Checklist + - [ ] The code change is tested and works locally. -- [ ] Tests pass. Your PR cannot be merged unless tests pass +- [ ] Tests pass. Your PR cannot be merged unless tests pass. -- + `poetry run behave` +- [ ] The code passes linting via + [black](https://black.readthedocs.io/en/stable/) (consistent code styling). -- + `poetry run black --check . --verbose --diff` +- [ ] The code passes linting via [pyflakes](https://launchpad.net/pyflakes) + (logically errors and unused imports). -- `poetry run pyflakes jrnl features` - [ ] There is no commented out code in this PR. - [ ] Have you followed the guidelines in our Contributing document? -- [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change? -- [ ] Have you added an explanation of what your changes do and why you'd like us to include them? +- [ ] Have you checked to ensure there aren't other open + [Pull Requests](../pulls) for the same update/change? +- [ ] Have you added an explanation of what your changes do and why you'd like + us to include them? - [ ] Have you written new tests for your core changes, as applicable? From 4b58577f1d84d73403d6cce9bd96da44e448fb64 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 2 May 2020 13:17:06 -0700 Subject: [PATCH 2/4] Disable --delete due to critical bug (#934) --- features/delete.feature | 2 +- jrnl/cli.py | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/features/delete.feature b/features/delete.feature index df6a1055..197746df 100644 --- a/features/delete.feature +++ b/features/delete.feature @@ -1,5 +1,5 @@ Feature: Delete entries from journal - + @skip Scenario: --delete flag allows deletion of single entry Given we use the config "deletion.yaml" When we run "jrnl -n 1" diff --git a/jrnl/cli.py b/jrnl/cli.py index 98c7ddc4..d1c88ea7 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -187,12 +187,14 @@ def parse_args(args=None): action="store_true", ) - exporting.add_argument( - "--delete", - dest="delete", - action="store_true", - help="Opens an interactive interface for deleting entries.", - ) + # Disabling this momentarily due to critical bug + # @see https://github.com/jrnl-org/jrnl/issues/932 + # exporting.add_argument( + # "--delete", + # dest="delete", + # action="store_true", + # help="Opens an interactive interface for deleting entries.", + # ) # Handle '-123' as a shortcut for '-n 123' num = re.compile(r"^-(\d+)$") @@ -301,6 +303,10 @@ def configure_logger(debug=False): def run(manual_args=None): args = parse_args(manual_args) + + # temporary until bring back --delete + args.delete = False # TODO: remove me + configure_logger(args.debug) if args.version: version_str = f"{jrnl.__title__} version {jrnl.__version__}" From c692b286364706bd94666bb532e5c7d3609d89e9 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 2 May 2020 20:33:49 +0000 Subject: [PATCH 3/4] Updating changelog [ci skip] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 528bd0cd..840f0c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [v2.4.1](https://pypi.org/project/jrnl/v2.4.1/) (2020-05-02) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.4...v2.4.1) + +**Fixed bugs:** + +- Disable --delete due to critical bug [\#934](https://github.com/jrnl-org/jrnl/pull/934) ([wren](https://github.com/wren)) + ## [v2.4](https://pypi.org/project/jrnl/v2.4/) (2020-04-25) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.3.1...v2.4) From 2d748bd3f3215721438ba3a613bb69b55207d6a2 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 2 May 2020 20:35:15 +0000 Subject: [PATCH 4/4] Incrementing version to v2.4.1 [ci skip] --- jrnl/__version__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jrnl/__version__.py b/jrnl/__version__.py index fe6946ba..c8de6a49 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1 +1 @@ -__version__ = "v2.4" +__version__ = "v2.4.1" diff --git a/pyproject.toml b/pyproject.toml index 3a8db15d..b7a165fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.4" +version = "v2.4.1" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ",