Jelajahi Sumber

Add bootstrap action to NEWS and make post-PR tweaks (#697).

Dan Helfman 2 tahun lalu
induk
melakukan
d84f1ec616

+ 4 - 0
NEWS

@@ -1,3 +1,7 @@
+1.7.15.dev0
+ * #697: Extract borgmatic configuration from backup via "borgmatic bootstrap" action—even when
+   borgmatic has no configuration yet!
+
 1.7.14
 1.7.14
  * #484: Add a new verbosity level (-2) to disable output entirely (for console, syslog, log file,
  * #484: Add a new verbosity level (-2) to disable output entirely (for console, syslog, log file,
    or monitoring), so not even errors are shown.
    or monitoring), so not even errors are shown.

+ 0 - 0
borgmatic/actions/config/__init__.py


+ 0 - 4
borgmatic/commands/arguments.py

@@ -1086,10 +1086,6 @@ def make_parsers():
     )
     )
     borg_group.add_argument('-h', '--help', action='help', help='Show this help message and exit')
     borg_group.add_argument('-h', '--help', action='help', help='Show this help message and exit')
 
 
-    merged_subparsers = argparse._SubParsersAction(
-        None, None, metavar=None, dest='merged', parser_class=None
-    )
-
     merged_subparsers = merge_subparsers(subparsers, config_subparsers)
     merged_subparsers = merge_subparsers(subparsers, config_subparsers)
 
 
     return top_level_parser, merged_subparsers
     return top_level_parser, merged_subparsers

+ 1 - 1
setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 from setuptools import find_packages, setup
 
 
-VERSION = '1.7.14'
+VERSION = '1.7.15.dev0'
 
 
 
 
 setup(
 setup(

+ 2 - 2
tests/unit/actions/test_create.py

@@ -115,7 +115,7 @@ def test_create_borgmatic_manifest_creates_manifest_file():
     flexmock(module.os).should_receive('makedirs').and_return(True)
     flexmock(module.os).should_receive('makedirs').and_return(True)
 
 
     flexmock(module.importlib_metadata).should_receive('version').and_return('1.0.0')
     flexmock(module.importlib_metadata).should_receive('version').and_return('1.0.0')
-    flexmock(module.json).should_receive('dump').and_return(True)
+    flexmock(module.json).should_receive('dump').and_return(True).once()
 
 
     module.create_borgmatic_manifest({}, 'test.yaml', False)
     module.create_borgmatic_manifest({}, 'test.yaml', False)
 
 
@@ -136,7 +136,7 @@ def test_create_borgmatic_manifest_creates_manifest_file_with_custom_borgmatic_s
             __exit__=lambda *args: None,
             __exit__=lambda *args: None,
         )
         )
     )
     )
-    flexmock(module.json).should_receive('dump').and_return(True)
+    flexmock(module.json).should_receive('dump').and_return(True).once()
 
 
     module.create_borgmatic_manifest(
     module.create_borgmatic_manifest(
         {'borgmatic_source_directory': '/borgmatic'}, 'test.yaml', False
         {'borgmatic_source_directory': '/borgmatic'}, 'test.yaml', False