Reformat with black.

Author: samsrabin

relink.py

@@ -270,7 +270,9 @@ def replace_one_file_with_symlink(inputdata_root, target_dir, file_path, dry_run
         os.rename(link_name, link_name + ".tmp")
         logger.info("%sDeleted original file: %s", INDENT, link_name)
     except OSError as e:
-        logger.error("%sError deleting file %s: %s. Skipping relink.", INDENT, link_name, e)
+        logger.error(
+            "%sError deleting file %s: %s. Skipping relink.", INDENT, link_name, e
+        )
         return
 
     # Create the symbolic link, handling necessary parent directories
@@ -283,7 +285,10 @@ def replace_one_file_with_symlink(inputdata_root, target_dir, file_path, dry_run
     except OSError as e:
         os.rename(link_name + ".tmp", link_name)
         logger.error(
-            "%sError creating symlink for %s: %s. Skipping relink.", INDENT, link_name, e
+            "%sError creating symlink for %s: %s. Skipping relink.",
+            INDENT,
+            link_name,
+            e,
         )
 
 

tests/relink/test_replace_files_with_symlinks.py

@@ -38,7 +38,9 @@ def fixture_mock_replace_one():
         yield mock
 
 
-def test_basic_file_replacement_given_dir(temp_dirs, current_user, mock_replace_one, caplog):
+def test_basic_file_replacement_given_dir(
+    temp_dirs, current_user, mock_replace_one, caplog
+):
     """Test basic functionality: given directory, replace owned file with symlink."""
     inputdata_root, target_dir = temp_dirs
     username = current_user
@@ -70,7 +72,9 @@ def test_basic_file_replacement_given_dir(temp_dirs, current_user, mock_replace_
     assert f"'{source_file}':" in caplog.text
 
 
-def test_basic_file_replacement_given_file(temp_dirs, current_user, mock_replace_one, caplog):
+def test_basic_file_replacement_given_file(
+    temp_dirs, current_user, mock_replace_one, caplog
+):
     """Test basic functionality: given owned file, replace with symlink."""
     inputdata_root, target_dir = temp_dirs
     username = current_user

tests/rimport/test_check_relink_worked.py

@@ -22,6 +22,7 @@
 # Don't add to sys.modules to avoid conflict with other test files
 loader.exec_module(rimport)
 
+
 def test_ok(tmp_path):
     """Check that it doesn't error if src is a symlink pointing to dst"""
     # Set up
@@ -32,6 +33,7 @@ def test_ok(tmp_path):
     # Shouldn't error
     rimport.check_relink_worked(src, dst)
 
+
 def test_error_not_symlink(tmp_path):
     """Check that it does error if src isn't a symlink"""
     # Set up
@@ -45,6 +47,7 @@ def test_error_not_symlink(tmp_path):
     # Verify error message was printed
     assert "Error relinking during rimport" in str(exc_info.value)
 
+
 def test_error_symlink_but_not_to_dst(tmp_path):
     """Check that it does error if src is a symlink but not pointing to dst"""
     # Set up
@@ -58,4 +61,4 @@ def test_error_symlink_but_not_to_dst(tmp_path):
         rimport.check_relink_worked(src, dst)
 
     # Verify error message was printed
-    assert "Error relinking during rimport" in str(exc_info.value)
+    assert "Error relinking during rimport" in str(exc_info.value)