Upgrade black

Author: virtuald

robotpy_installer/_pipstub.py

@@ -9,7 +9,6 @@
 import os
 import sys
 
-
 if __name__ == "__main__":
     # Setup environment for what the RoboRIO python would have
     # -> strictly speaking we only care about platform.machine as that's what

robotpy_installer/cli_init.py

@@ -10,7 +10,6 @@
 from .errors import Error
 from .utils import handle_cli_error
 
-
 logger = logging.getLogger("init")
 
 

robotpy_installer/cli_sync.py

@@ -184,17 +184,13 @@ def run(
                 os.execv(sys.executable, pip_args)
 
             with tempfile.NamedTemporaryFile("w", delete=False, suffix=".py") as fp:
-                fp.write(
-                    inspect.cleandoc(
-                        f"""
+                fp.write(inspect.cleandoc(f"""
                         import os, subprocess
                         subprocess.run({pip_args!r})
                         print()
                         input("Install complete, press enter to continue")
                         os.unlink(__file__)
-                    """
-                    )
-                )
+                    """))
 
             print("pip is launching in a new window to complete the installation")
             subprocess.Popen(

robotpy_installer/installer.py

@@ -175,24 +175,20 @@ def opkg_install(
         #    to only install a package if it's not already installed
         opkg_files = []
 
-        opkg_script = inspect.cleandoc(
-            """
+        opkg_script = inspect.cleandoc("""
             set -e
             PACKAGES=()
             DO_INSTALL=0
-            """
-        )
+            """)
 
-        opkg_script_bit = inspect.cleandoc(
-            f"""
+        opkg_script_bit = inspect.cleandoc(f"""
             if ! opkg list-installed | grep -F "%(name)s - %(version)s"; then
                 PACKAGES+=("http://localhost:{self.cache_server.port}/opkg_cache/%(fname)s")
                 DO_INSTALL=1
             else
                 echo "%(name)s already installed"
             fi
-            """
-        )
+            """)
 
         for package in packages:
             pkgname, pkgversion, _ = package.name.split("_")
@@ -209,9 +205,7 @@ def opkg_install(
             opkg_files.append(package.name)
 
         # Finish it out
-        opkg_script += "\n" + (
-            inspect.cleandoc(
-                """
+        opkg_script += "\n" + (inspect.cleandoc("""
                 if [ "${DO_INSTALL}" == "0" ]; then
                     echo "No packages to install."
                 else
@@ -221,10 +215,7 @@ def opkg_install(
 
                 sync
                 ldconfig
-                """
-            )
-            % {"options": "--force-reinstall" if force_reinstall else ""}
-        )
+                """) % {"options": "--force-reinstall" if force_reinstall else ""})
 
         with catch_ssh_error("creating opkg install script"):
             # write to /tmp so that it doesn't persist
@@ -356,15 +347,11 @@ def ensure_robot_pip(self):
 
         with catch_ssh_error("checking for pip3"):
             if self.ssh.exec_cmd("[ -x /usr/local/bin/pip3 ]").returncode != 0:
-                raise InstallerException(
-                    inspect.cleandoc(
-                        """
+                raise InstallerException(inspect.cleandoc("""
                         pip3 not found on RoboRIO, did you install python?
 
                         Use the 'download-python' and 'install-python' commands first!
-                        """
-                    )
-                )
+                        """))
 
         # Use pip stub to override the wheel platform on roborio
         with catch_ssh_error("copying pip stub"):

robotpy_installer/pyproject.py

@@ -134,8 +134,7 @@ def write_default_gitignore(project_path: pathlib.Path):
     :param project_path: Path to robot project
     """
 
-    ignore_content = inspect.cleandoc(
-        """
+    ignore_content = inspect.cleandoc("""
     # Log file
     *.log
 
@@ -362,8 +361,7 @@ def write_default_gitignore(project_path: pathlib.Path):
 
     # PyPI configuration file
     .pypirc
-        """
-    )
+        """)
 
     ignore_content += "\n"
 
@@ -396,8 +394,7 @@ def write_default_pyproject(
             f'"{extra}",' for extra in sorted(provides_extra)
         )
 
-    content = inspect.cleandoc(
-        f"""
+    content = inspect.cleandoc(f"""
             
             #
             # Use this configuration file to control what RobotPy packages are installed
@@ -419,8 +416,7 @@ def write_default_pyproject(
             # is equivalent to a line in requirements.txt)
             requires = []
 
-        """
-    )
+        """)
 
     content += "\n"
     content = content.replace("##EXTRAS##", extras)

robotpy_installer/wpilib_preferences.py

@@ -4,7 +4,6 @@
 import pathlib
 import typing
 
-
 logger = logging.getLogger("robotpy.installer")
 
 

tests/test_pyproject.py

@@ -16,12 +16,10 @@ def null_resolver(req: Requirement, env: pypackages.Env) -> typing.List[Requirem
 
 
 def test_ok():
-    project = load_project(
-        f"""
+    project = load_project(f"""
         [tool.robotpy]
         robotpy_version = "{YEAR}.1.1.2"
-    """
-    )
+    """)
     installed = pypackages.make_packages({"robotpy": f"{YEAR}.1.1.2"})
     assert project.are_requirements_met(
         installed, pypackages.roborio_env(), null_resolver
@@ -32,12 +30,10 @@ def test_ok():
 
 
 def test_older_fail():
-    project = load_project(
-        f"""
+    project = load_project(f"""
         [tool.robotpy]
         robotpy_version = "{YEAR}.1.1.2"
-    """
-    )
+    """)
     installed = pypackages.make_packages({"robotpy": f"{YEAR}.1.1.0"})
     assert project.are_requirements_met(
         installed, pypackages.roborio_env(), null_resolver
@@ -48,12 +44,10 @@ def test_older_fail():
 
 
 def test_older_and_newer_fail():
-    project = load_project(
-        f"""
+    project = load_project(f"""
         [tool.robotpy]
         robotpy_version = "{YEAR}.1.1.2"
-    """
-    )
+    """)
     installed = pypackages.make_packages(
         {"robotpy": [f"{YEAR}.1.1.0", f"{YEAR}.1.1.4"]}
     )
@@ -66,15 +60,13 @@ def test_older_and_newer_fail():
 
 
 def test_beta_empty_req():
-    project = load_project(
-        f"""
+    project = load_project(f"""
         [tool.robotpy]
         robotpy_version = "{YEAR}.1.1.2"
         requires = [
             "robotpy-commands-v2"
         ]
-    """
-    )
+    """)
 
     installed = pypackages.make_packages(
         {"robotpy": f"{YEAR}.1.1.2", "robotpy-commands-v2": f"{YEAR}.0.0b4"}
@@ -89,16 +81,14 @@ def test_beta_empty_req():
 
 
 def test_env_marker():
-    project = load_project(
-        f"""
+    project = load_project(f"""
         [tool.robotpy]
         robotpy_version = "{YEAR}.1.1.2"
         requires = [
             "robotpy-opencv; platform_machine == 'roborio'",
             "opencv-python; platform_machine != 'roborio'"
         ]
-    """
-    )
+    """)
 
     installed = pypackages.make_packages(
         {"robotpy": f"{YEAR}.1.1.2", "robotpy-opencv": f"{YEAR}.0.0"}