Merge branch 'upstream_develop' into delete-all-932

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(
-        "--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__}"