From a33bd5b856f41facfa2cae8bbd752b77740680da Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Thu, 5 Oct 2023 22:27:09 +0100
Subject: [PATCH] fixes merge hooks (#22730)

---
 _build_dependencies.sh                            | 2 +-
 tools/bootstrap/{python37._pth => python311._pth} | 2 +-
 tools/bootstrap/python_.ps1                       | 2 +-
 tools/requirements.txt                            | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename tools/bootstrap/{python37._pth => python311._pth} (63%)

diff --git a/_build_dependencies.sh b/_build_dependencies.sh
index e824c19d87b..f943ddf72c2 100644
--- a/_build_dependencies.sh
+++ b/_build_dependencies.sh
@@ -12,4 +12,4 @@ export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
 export BETA_BYOND_MINOR=1610
 # Python version for mapmerge and other tools
-export PYTHON_VERSION=3.7.9
+export PYTHON_VERSION=3.11.6
diff --git a/tools/bootstrap/python37._pth b/tools/bootstrap/python311._pth
similarity index 63%
rename from tools/bootstrap/python37._pth
rename to tools/bootstrap/python311._pth
index 47d58cdcdb2..abba38c9271 100644
--- a/tools/bootstrap/python37._pth
+++ b/tools/bootstrap/python311._pth
@@ -1,4 +1,4 @@
-python37.zip
+python311.zip
 .
 ..\..\..
 
diff --git a/tools/bootstrap/python_.ps1 b/tools/bootstrap/python_.ps1
index 505fb92194d..47d1d4b46de 100644
--- a/tools/bootstrap/python_.ps1
+++ b/tools/bootstrap/python_.ps1
@@ -50,7 +50,7 @@ if (!(Test-Path $PythonExe -PathType Leaf)) {
 	[System.IO.Compression.ZipFile]::ExtractToDirectory($Archive, $PythonDir)
 
 	# Copy a ._pth file without "import site" commented, so pip will work
-	Copy-Item "$Bootstrap/python37._pth" $PythonDir `
+	Copy-Item "$Bootstrap/python311._pth" $PythonDir `
 		-ErrorAction Stop
 
 	Remove-Item $Archive
diff --git a/tools/requirements.txt b/tools/requirements.txt
index e04bf2fa4e5..0c0b75cd37b 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,8 +1,8 @@
-pygit2==1.7.2
-bidict==0.22.0
-Pillow==9.3.0
+pygit2==1.13.1
+bidict==0.22.1
+Pillow==10.0.1
 json5==0.9.14
 
 # changelogs
 PyYaml==6.0.1 # maplint also
-beautifulsoup4==4.9.3
+beautifulsoup4==4.12.2