From e4630a0a07dac62d3f1681f594ba2eda1daf3848 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 30 Sep 2024 21:55:30 +1000
Subject: [PATCH] Pin setuptools to 0.69

Newer versions break 'import pkg_resources' from a bundled build,
due to Pyoxidizer.

https://forums.ankiweb.net/t/anki-24-10-beta/49989/66
---
 python/requirements.base.in    |  1 +
 python/requirements.base.txt   | 10 ++++++----
 python/requirements.bundle.txt |  6 +++---
 python/requirements.dev.txt    |  6 +++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/python/requirements.base.in b/python/requirements.base.in
index 705e50e83..12d6f803c 100644
--- a/python/requirements.base.in
+++ b/python/requirements.base.in
@@ -1,2 +1,3 @@
 pip-tools
 colorama # required on windows
+setuptools<70 # newer versions break pyoxidizer pkg_resources import
\ No newline at end of file
diff --git a/python/requirements.base.txt b/python/requirements.base.txt
index 24e3870f9..fda801a71 100644
--- a/python/requirements.base.txt
+++ b/python/requirements.base.txt
@@ -48,7 +48,9 @@ pip==24.2 \
     --hash=sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2 \
     --hash=sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8
     # via pip-tools
-setuptools==74.1.1 \
-    --hash=sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847 \
-    --hash=sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766
-    # via pip-tools
+setuptools==69.5.1 \
+    --hash=sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987 \
+    --hash=sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32
+    # via
+    #   -r requirements.base.in
+    #   pip-tools
diff --git a/python/requirements.bundle.txt b/python/requirements.bundle.txt
index a0ace5d5a..57162cc1b 100644
--- a/python/requirements.bundle.txt
+++ b/python/requirements.bundle.txt
@@ -494,9 +494,9 @@ pip==24.2 \
     # via
     #   -r requirements.base.txt
     #   pip-tools
-setuptools==74.1.1 \
-    --hash=sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847 \
-    --hash=sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766
+setuptools==69.5.1 \
+    --hash=sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987 \
+    --hash=sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32
     # via
     #   -r requirements.base.txt
     #   pip-tools
diff --git a/python/requirements.dev.txt b/python/requirements.dev.txt
index f0dc438d2..b9c3301aa 100644
--- a/python/requirements.dev.txt
+++ b/python/requirements.dev.txt
@@ -736,9 +736,9 @@ pip==24.2 \
     # via
     #   -r requirements.bundle.txt
     #   pip-tools
-setuptools==74.1.1 \
-    --hash=sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847 \
-    --hash=sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766
+setuptools==69.5.1 \
+    --hash=sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987 \
+    --hash=sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32
     # via
     #   -r requirements.bundle.txt
     #   pip-tools