[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
+    rev: 26.1.0
     hooks:
       -   id: black
 

examples/FuncADL_Uproot_Dict.py

@@ -1,6 +1,5 @@
 from servicex import query, dataset, deliver
 
-
 spec = {
     "Sample": [
         {

examples/FuncADL_Uproot_Typed.py

@@ -1,6 +1,5 @@
 from servicex import Sample, ServiceXSpec, query, dataset, deliver
 
-
 spec = ServiceXSpec(
     Sample=[
         Sample(
@@ -16,7 +15,7 @@
             .FromTree("CollectionTree")
             .Select(
                 lambda e: {"el_pt": e["AnalysisElectronsAuxDyn.pt"]}
-            ),  # type:ignore
+            ),  # type: ignore
         )
     ]
 )

examples/TopCP_Dict.py

@@ -1,6 +1,5 @@
 from servicex import query, dataset, deliver
 
-
 spec = {
     "Sample": [
         {

examples/TopCP_Typed.py

@@ -1,6 +1,5 @@
 from servicex import Sample, ServiceXSpec, query, dataset, deliver
 
-
 spec = ServiceXSpec(
     Sample=[
         Sample(

examples/UprootRaw_Dict.py

@@ -1,6 +1,5 @@
 from servicex import query, dataset, deliver
 
-
 spec = {
     "Sample": [
         {

examples/UprootRaw_Typed.py

@@ -1,6 +1,5 @@
 from servicex import Sample, ServiceXSpec, query, dataset, deliver
 
-
 spec = ServiceXSpec(
     Sample=[
         Sample(

servicex/app/cli_options.py

@@ -27,7 +27,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 import typer
 
-
 backend_cli_option = typer.Option(
     None, "-b", "--backend", help="Name of backend server from .servicex file"
 )

servicex/app/init.py

@@ -145,16 +145,14 @@ def run(
     # Write configuration file
     config_path = Path.cwd() / "servicex.yaml"
     with open(config_path, "w") as file:
-        file.write(
-            f"""api_endpoints:
+        file.write(f"""api_endpoints:
   - endpoint: {url}
     name: {service_name}
     {"token: " + str(token) if not auth_disabled else ""}
 
 cache_path: {downloads_path}
 shortened_downloaded_filename: true
-"""
-        )
+""")
 
     # Success message
     console.print()

servicex/dataset/__init__.py

@@ -34,5 +34,4 @@
     XRootDDatasetIdentifier as XRootD,
 )
 
-
 __any__ = ["Rucio", "FileList", "CERNOpenData", "GenericDataSet", "XRootD"]

servicex/dataset_group.py

@@ -34,7 +34,6 @@
 from servicex.models import TransformedResults, ResultFormat
 from make_it_sync import make_sync
 
-
 DatasetGroupMember = Query
 
 

servicex/expandable_progress.py

@@ -38,7 +38,6 @@
     TaskID,
 )
 
-
 DEFAULT_STYLE = [
     TextColumn("[progress.description]{task.description}"),
     BarColumn(complete_style="rgb(114,156,31)", finished_style="rgb(0,255,0)"),

tests/app/test_codegen.py

@@ -33,11 +33,8 @@ def test_codegen_list(script_runner):
             ["servicex", "codegen", "list", "-c", "tests/example_config.yaml"]
         )
         assert result.returncode == 0
-        assert (
-            result.stdout
-            == """{
+        assert result.stdout == """{
   "uproot": "http://uproot-codegen",
   "xaod": "http://xaod-codegen"
 }
 """
-        )

tests/test_config.py

@@ -77,13 +77,11 @@ def test_read_from_home(monkeypatch, tmp_path):
     home = tmp_path / "home"
     home.mkdir()
     cfg = home / "servicex.yaml"
-    cfg.write_text(
-        """
+    cfg.write_text("""
 api_endpoints:
   - endpoint: http://localhost:5000
     name: localhost
-"""
-    )
+""")
 
     # Patch Path.home to point to our fake home and move cwd elsewhere
     monkeypatch.setattr(Path, "home", lambda: home)
@@ -103,13 +101,11 @@ def test_read_from_default_files(monkeypatch, tmp_path, config_filename):
 
     # Create a fake home directory with the config file
     cfg = tmp_path / config_filename
-    cfg.write_text(
-        """
+    cfg.write_text("""
 api_endpoints:
   - endpoint: http://localhost:5012
     name: localhost
-"""
-    )
+""")
 
     monkeypatch.chdir(tmp_path)
 

tests/test_databinder.py

@@ -441,8 +441,7 @@ def test_yaml(tmp_path):
 
     # Nominal paths
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -477,8 +476,7 @@ def run_query(input_filenames=None):
   - Name: ttH8
     Dataset: !Rucio user.kchoi:user.kchoi.fcnc_tHq_ML.ttH.v113
     Query: !TopCP 'reco="examples/reco.yaml"'
-"""
-        )
+""")
         f.flush()
         result = _load_ServiceXSpec(path)
         assert type(result.Sample[0].Query).__name__ == "PythonFunction"
@@ -508,8 +506,7 @@ def run_query(input_filenames=None):
 
     # Python syntax error
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -520,16 +517,14 @@ def run_query(input_filenames=None):
     Query: !PythonFunction |
         def run_query(input_filenames=None):
             i ==== 18 # syntax error
-"""
-        )
+""")
         f.flush()
         with pytest.raises(SyntaxError):
             _load_ServiceXSpec(path)
 
     # Duplicate samples with different names but same dataset and query
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -545,17 +540,15 @@ def run_query(input_filenames=None):
   - Name: ttH5
     Dataset: !FileList ["/path/to/file1.root", "/path/to/file2.root"]
     Query: !UprootRaw '[{"treename": "nominal"}]'
-    """
-        )
+    """)
         f.flush()
         with pytest.raises(RuntimeError):
             _load_ServiceXSpec(path)
 
     # Duplicate samples with different names but same datasets (multiple) and query
     # change the order of the datasets
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -571,17 +564,15 @@ def run_query(input_filenames=None):
   - Name: ttH5
     Dataset: !FileList ["/path/to/file1.root", "/path/to/file2.root"]
     Query: !UprootRaw '[{"treename": "nominal"}]'
-    """
-        )
+    """)
         f.flush()
         with pytest.raises(RuntimeError):
             _load_ServiceXSpec(path)
 
     # Samples with different names but same datasets(multiple) and query
     # different NFiles
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -595,8 +586,7 @@ def run_query(input_filenames=None):
     NFiles: 1
     Dataset: !FileList ["/path/to/file1.root", "/path/to/file2.root"]
     Query: !UprootRaw '[{"treename": "nominal"}]'
-    """
-        )
+    """)
         f.flush()
         result = _load_ServiceXSpec(path)
         assert type(result.Sample[0].Query).__name__ == "UprootRawQuery"
@@ -605,8 +595,7 @@ def run_query(input_filenames=None):
     # Samples with different names but same datasets(multiple) and
     # different queries
     with open(path := (tmp_path / "python.yaml"), "w") as f:
-        f.write(
-            """
+        f.write("""
 General:
   OutputFormat: root-ttree
   Delivery: LocalCache
@@ -618,8 +607,7 @@ def run_query(input_filenames=None):
   - Name: ttH6
     Dataset: !FileList ["/path/to/file1.root", "/path/to/file2.root"]
     Query: !UprootRaw '[{"treename": "CollectionTree"}]'
-    """
-        )
+    """)
         f.flush()
         result = _load_ServiceXSpec(path)
         assert type(result.Sample[0].Query).__name__ == "UprootRawQuery"
@@ -634,15 +622,12 @@ def test_yaml_include(tmp_path):
         open(tmp_path / "definitions.yaml", "w") as f1,
         open(path2 := (tmp_path / "parent.yaml"), "w") as f2,
     ):
-        f1.write(
-            """
+        f1.write("""
 - &DEF_query !PythonFunction |
         def run_query(input_filenames=None):
             return []
-"""
-        )
-        f2.write(
-            """
+""")
+        f2.write("""
 Definitions:
     !include definitions.yaml
 
@@ -654,8 +639,7 @@ def run_query(input_filenames=None):
   - Name: ttH
     RucioDID: user.kchoi:user.kchoi.fcnc_tHq_ML.ttH.v11
     Query: *DEF_query
-"""
-        )
+""")
         f1.flush()
         f2.flush()
         _load_ServiceXSpec(path2)

tests/test_servicex_adapter.py

@@ -116,11 +116,9 @@ async def test_get_transforms_wlcg_bearer_token(
     }
     post.return_value.__aenter__.return_value.status = 401
     token_file = tempfile.NamedTemporaryFile(mode="w+t", delete=False)
-    token_file.write(
-        """"
+    token_file.write(""""
     eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
-    """
-    )
+    """)
     token_file.close()
 
     with patch.dict(os.environ, {"BEARER_TOKEN_FILE": token_file.name}):

tests/test_topcp_dataset.py

@@ -36,12 +36,10 @@
 def test_default_keys():
     with tempfile.NamedTemporaryFile(mode="w", delete=False) as fp:
         test_logfile_path = Path(fp.name)
-        fp.write(
-            """
+        fp.write("""
 CommonServices:
   runSystematics: False
-        """
-        )
+        """)
         fp.close()
 
         topcp_query = TopCPQuery(reco=test_logfile_path)
@@ -67,8 +65,7 @@ def test_yaml_serialization():
         tempfile.NamedTemporaryFile(mode="w", delete=False) as f2,
     ):
         test_parton_yaml = Path(f1.name)
-        f1.write(
-            """
+        f1.write("""
 CommonServices:
   systematicsHistogram: 'listOfSystematicsPartonLevel'
   runSystematics: True
@@ -77,12 +74,10 @@ def test_yaml_serialization():
 
 PartonHistory:
   - histories: 'Ttbar'
-        """
-        )
+        """)
         f1.close()
         test_particle_yaml = Path(f2.name)
-        f2.write(
-            """
+        f2.write("""
 CommonServices:
   systematicsHistogram: 'listOfSystematicsParticleLevel'
   runSystematics: True
@@ -95,8 +90,7 @@ def test_yaml_serialization():
     useDressedProperties: True
     minPt: 25000.0
     maxEta: 2.5
-        """
-        )
+        """)
         f2.close()
 
         topcp_query = TopCPQuery(parton=test_parton_yaml, particle=test_particle_yaml)