Skip to content

Commit 2beedc7

Browse files
authored
CLI: Always use Python 3 (#132)
Since Publish now requires macOS 12, we can safely require Python 3 when using the CLI's `run` command to start a local web server.
1 parent a0d30bc commit 2beedc7

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

Sources/PublishCLICore/WebsiteRunner.swift

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal struct WebsiteRunner {
3030
serverQueue.async {
3131
do {
3232
_ = try shellOut(
33-
to: "python -m \(self.resolvePythonHTTPServerCommand()) \(self.portNumber)",
33+
to: "python3 -m http.server \(self.portNumber)",
3434
at: outputFolder.path,
3535
process: serverProcess
3636
)
@@ -55,22 +55,6 @@ private extension WebsiteRunner {
5555
catch { throw CLIError.outputFolderNotFound }
5656
}
5757

58-
func resolvePythonHTTPServerCommand() -> String {
59-
if resolveSystemPythonMajorVersionNumber() >= 3 {
60-
return "http.server"
61-
} else {
62-
return "SimpleHTTPServer"
63-
}
64-
}
65-
66-
func resolveSystemPythonMajorVersionNumber() -> Int {
67-
// Expected output: `Python X.X.X`
68-
let pythonVersionString = try? shellOut(to: "python --version")
69-
let fullVersionNumber = pythonVersionString?.split(separator: " ").last
70-
let majorVersionNumber = fullVersionNumber?.first
71-
return majorVersionNumber?.wholeNumberValue ?? 2
72-
}
73-
7458
func outputServerErrorMessage(_ message: String) {
7559
var message = message
7660

0 commit comments

Comments
 (0)