Remove Python scripts for launching applications (#459)

Resolves #437. Signed-off-by: Jade Turner <[email protected]>
wpilibsuite · Oct 19, 2024 · 52bc77e · 52bc77e
1 parent 28900e5
commit 52bc77e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 229 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -129,18 +129,9 @@ jobs:
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.x
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.8
-
-      - name: Install black
-        run: pip3 install black
 
       - name: Run dotnet format
         run: dotnet format
 
-      - name: Run black
-        run: black .
-
       - name: Verify formatters made no changes
         run: git --no-pager diff --exit-code HEAD
diff --git a/apps/ToolsUpdater/src/main/java/Program.java b/apps/ToolsUpdater/src/main/java/Program.java
@@ -31,7 +31,6 @@ private static void installJavaTool(ToolConfig tool, String toolsPath) {
         if (SystemUtils.IS_OS_WINDOWS) {
           Files.copy(Paths.get(toolsPath, "ScriptBase.vbs"), Paths.get(toolsPath, tool.name + ".vbs"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         } else {
-          Files.copy(Paths.get(toolsPath, "ScriptBase.py"), Paths.get(toolsPath, tool.name + ".py"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
           Files.copy(Paths.get(toolsPath, "ScriptBase.sh"), Paths.get(toolsPath, tool.name + ".sh"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         }
       } catch (IOException e) {
@@ -86,7 +85,6 @@ private static void installCppTool(ToolConfig tool, String toolsPath) {
         if (SystemUtils.IS_OS_WINDOWS) {
           Files.copy(Paths.get(toolsPath, "ScriptBaseCpp.vbs"), Paths.get(toolsPath, tool.name + ".vbs"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         } else {
-          Files.copy(Paths.get(toolsPath, "ScriptBaseCpp.py"), Paths.get(toolsPath, tool.name + ".py"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
           Files.copy(Paths.get(toolsPath, "ScriptBaseCpp.sh"), Paths.get(toolsPath, tool.name + ".sh"), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         }
 

diff --git a/files/AdvantageScope.py b/files/AdvantageScope.py
diff --git a/files/MavenMetaDataFixer.py b/files/MavenMetaDataFixer.py
diff --git a/files/ScriptBase.py b/files/ScriptBase.py
diff --git a/files/ScriptBaseCpp.py b/files/ScriptBaseCpp.py
diff --git a/files/ToolsUpdater.py b/files/ToolsUpdater.py
diff --git a/scripts/installer.gradle b/scripts/installer.gradle
@@ -5,10 +5,8 @@ evaluationDependsOn(':apps:MavenMetaDataFixer')
 evaluationDependsOn(':apps:ToolsUpdater')
 
 def metaDataScriptBatch = file("$rootDir/files/MavenMetaDataFixer.bat")
-def metaDataScriptPy = file("$rootDir/files/MavenMetaDataFixer.py")
 def metaDataScriptSh = file("$rootDir/files/MavenMetaDataFixer.sh")
 def toolsUpdaterBatch = file("$rootDir/files/ToolsUpdater.bat")
-def toolsUpdaterPy = file("$rootDir/files/ToolsUpdater.py")
 def toolsUpdaterSh = file("$rootDir/files/ToolsUpdater.sh")
 
 ext.msBuildExtraSetup = { AbstractArchiveTask zip->
@@ -17,10 +15,8 @@ ext.msBuildExtraSetup = { AbstractArchiveTask zip->
   zip.inputs.file project(':apps:ToolsUpdater').shadowJar.archivePath
   zip.inputs.file metaDataScriptBatch
   zip.inputs.file metaDataScriptSh
-  zip.inputs.file metaDataScriptPy
   zip.inputs.file toolsUpdaterBatch
   zip.inputs.file toolsUpdaterSh
-  zip.inputs.file toolsUpdaterPy
 
   zip.dependsOn project(':apps:MavenMetaDataFixer').shadowJar
   zip.dependsOn project(':apps:ToolsUpdater').shadowJar
@@ -35,10 +31,6 @@ ext.msBuildExtraSetup = { AbstractArchiveTask zip->
       into '/maven'
       fileMode 0755
     }
-    zip.from(metaDataScriptPy) {
-      into '/maven'
-      fileMode 0755
-    }
   } else {
     zip.from(metaDataScriptBatch) {
       into '/maven'
@@ -55,10 +47,6 @@ ext.msBuildExtraSetup = { AbstractArchiveTask zip->
       into '/tools'
       fileMode 0755
     }
-    zip.from(toolsUpdaterPy) {
-      into '/tools'
-      fileMode 0755
-    }
   } else {
     zip.from(toolsUpdaterBatch) {
       into '/tools'

diff --git a/scripts/tools.gradle b/scripts/tools.gradle
@@ -1,14 +1,11 @@
 def toolsJson = file("$buildDir/tools.json")
 def scriptBaseFile = file("files/ScriptBase.vbs")
-def scriptBasePythonFile = file("files/ScriptBase.py")
 def scriptBaseUnixFile = file("files/ScriptBase.sh")
 
 def scriptBaseCppFile = file("files/ScriptBaseCpp.vbs")
-def scriptBaseCppPythonFile = file("files/ScriptBaseCpp.py")
 def scriptBaseCppUnixFile = file("files/ScriptBaseCpp.sh")
 
 def advantageScopeScriptFile = file("files/AdvantageScope.vbs")
-def advantageScopeScriptPythonFile = file("files/AdvantageScope.py")
 def advantageScopeScriptUnixFile = file("files/AdvantageScope.sh")
 
 def choreoScriptFile = file("files/Choreo.vbs")
@@ -90,7 +87,6 @@ ext.toolsSetup = { AbstractArchiveTask zip->
   zip.inputs.file toolsJson
   zip.inputs.file scriptBaseFile
   zip.inputs.file scriptBaseUnixFile
-  zip.inputs.file scriptBasePythonFile
 
   zip.from (toolsJson) {
     into '/tools'
@@ -118,31 +114,16 @@ ext.toolsSetup = { AbstractArchiveTask zip->
       fileMode 0755
     }
 
-    zip.from (scriptBasePythonFile) {
-      into '/tools'
-      fileMode 0755
-    }
-
     zip.from (scriptBaseCppUnixFile) {
       into '/tools'
       fileMode 0755
     }
 
-    zip.from (scriptBaseCppPythonFile) {
-      into '/tools'
-      fileMode 0755
-    }
-
     zip.from (advantageScopeScriptUnixFile) {
       into '/tools'
       fileMode 0755
     }
 
-    zip.from (advantageScopeScriptPythonFile) {
-      into '/tools'
-      fileMode 0755
-    }
-
     zip.from (choreoScriptUnixFile) {
       into '/tools'
       fileMode 0755