Merge branch 'upstream_develop' into delete-all-932

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,8 @@
 
+<!--
 # **TEMPLATE PLEASE EDIT**
-*Thank you for wanting to contribute! Please fill out this description as well as look at the checklist!*
+*Thank you for wanting to contribute! Please fill out this description as well
+as look at the checklist!*
 
 *Short block of text containing:
 - Relevant changes in text form
@@ -9,11 +11,22 @@
 - Example of usage (if applicable)
 - Example of changes to config files (if applicable)
 *
+-->
+
 ### 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 checked to ensure there aren't other open
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+  [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?

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)

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"

jrnl/__version__.py

@@ -1 +1 @@
-__version__ = "v2.4"
+__version__ = "v2.4.1"

jrnl/cli.py

@@ -187,12 +187,14 @@ def parse_args(args=None):
         action="store_true",
     )
 
-    exporting.add_argument(
+    # Disabling this momentarily due to critical bug
-        "--delete",
+    # @see https://github.com/jrnl-org/jrnl/issues/932
-        dest="delete",
+    # exporting.add_argument(
-        action="store_true",
+    #     "--delete",
-        help="Opens an interactive interface for deleting entries.",
+    #     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__}"

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 <manuel@1450.me>",