Fix leftover conflict

cctbx · Aug 21, 2023 · 63e5ebe · 63e5ebe
1 parent 63d5618
commit 63e5ebe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/command_line/test_average.py b/tests/command_line/test_average.py
@@ -9,7 +9,7 @@
 
 
 @pytest.mark.parametrize("use_mpi", [True, False])
-def test_average(dials_data, tmpdir, use_mpi):
+def test_average(dials_data, tmp_path, use_mpi):
     # Only allow MPI tests if we've got MPI capabilities
     if use_mpi:
         pytest.importorskip("mpi4py")