Skip to content

Commit

Permalink
Python-related Repo Gruntwork (#1081)
Browse files Browse the repository at this point in the history
* Python-related Repo Gruntwork

Ports:
tgstation/tgstation#72488
tgstation/tgstation#67520

Co-authored-by: ZephyrTFA <[email protected]>
Co-authored-by: David Walker <[email protected]>

* ...can we just kinda, do this?

* kill me softly

---------

Co-authored-by: ZephyrTFA <[email protected]>
Co-authored-by: David Walker <[email protected]>
  • Loading branch information
3 people authored Aug 22, 2024
1 parent db5d623 commit ba93634
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
run_linters:
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Run Linters
runs-on: ubuntu-20.04 #Pinning this for now, the correct way is to port Mothblocks' update to 22.*
runs-on: ubuntu-22.04
concurrency:
group: run_linters-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand Down
2 changes: 1 addition & 1 deletion dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export NODE_VERSION_PRECISE=20.14.0
export SPACEMAN_DMM_VERSION=suite-1.8

# Python version for mapmerge and other tools
export PYTHON_VERSION=3.7.9
export PYTHON_VERSION=3.9.0
6 changes: 0 additions & 6 deletions tools/bootstrap/python37._pth

This file was deleted.

7 changes: 6 additions & 1 deletion tools/bootstrap/python_.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ if (!(Test-Path $PythonExe -PathType Leaf)) {

[System.IO.Compression.ZipFile]::ExtractToDirectory($Archive, $PythonDir)

$PythonVersionArray = $PythonVersion.Split(".")
$PythonVersionString = "python$($PythonVersionArray[0])$($PythonVersionArray[1])"
Write-Output "Generating PATH descriptor."
New-Item "$Cache/$PythonVersionString._pth" | Out-Null
Set-Content "$Cache/$PythonVersionString._pth" "$PythonVersionString.zip`n.`n..\..\..`nimport site`n"
# Copy a ._pth file without "import site" commented, so pip will work
Copy-Item "$Bootstrap/python37._pth" $PythonDir `
Copy-Item "$Cache/$PythonVersionString._pth" $PythonDir `
-ErrorAction Stop

Remove-Item $Archive
Expand Down
6 changes: 3 additions & 3 deletions tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pygit2==1.0.1
bidict==0.13.1
pygit2==1.7.2
bidict==0.22.0
Pillow==9.0.1

# changelogs
PyYaml==5.4
PyYaml==6.0.1 #Also the Linter.
beautifulsoup4==4.9.3

0 comments on commit ba93634

Please sign in to comment.