From 32a144734bfa6fb5002746932e0c2cd98ad6668d Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 28 Aug 2024 19:24:36 -0400 Subject: [PATCH 1/2] Update tools URL to use GitHub Pages --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index 49d2d98a..ac92cc43 100755 --- a/build.py +++ b/build.py @@ -101,7 +101,7 @@ doxygenMD5 = { } # And the location where they can be downloaded from -toolsURL = 'https://wxpython.org/Phoenix/tools' +toolsURL = 'https://wxwidgets.github.io/wxPython-tools' # MS Edge code and DLLs needed for the wxWEBVIEW_BACKEND_EDGE backend From f3c5eaba49de2690132def0d30f7c4bf5de766be Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 28 Aug 2024 19:38:10 -0400 Subject: [PATCH 2/2] Pin setuptools to < 74 on Windows due to removal of setuptools.msvc --- requirements/devel.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/devel.txt b/requirements/devel.txt index be8a429c..dfbb78ea 100644 --- a/requirements/devel.txt +++ b/requirements/devel.txt @@ -1,8 +1,8 @@ # Python packages needed for building and testing wxPython Phoenix -r install.txt appdirs -setuptools < 45 ; python_version < '3.0' -setuptools ; python_version >= '3.0' +setuptools < 74 ; sys.platform == 'win32' +setuptools ; sys.platform != 'win32' sip == 6.8.5 wheel