From e5f1380497b7313124a79688c62be8395c0f56b1 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Mon, 25 Nov 2024 16:09:01 +0000 Subject: [PATCH 1/3] Force utf8 mode on Windows --- src/tools/scripts/run_and_test_website.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/scripts/run_and_test_website.bat b/src/tools/scripts/run_and_test_website.bat index 4472b82e75a..29f57c0d4c6 100644 --- a/src/tools/scripts/run_and_test_website.bat +++ b/src/tools/scripts/run_and_test_website.bat @@ -26,7 +26,7 @@ echo "Building website" call npm run generate echo "Starting website" -start python main.py +start python -Xutf8 main.py rem # Sleep for 5 seconds to make sure server is up timeout /t 5 /nobreak rem # Use sleep as well in case running in GitBash where above command fails From 8bb3a37152e3261bb2e353493e51558384dbe5cb Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Mon, 25 Nov 2024 16:16:32 +0000 Subject: [PATCH 2/3] Fix timeout --- src/tools/scripts/run_and_test_website.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/scripts/run_and_test_website.bat b/src/tools/scripts/run_and_test_website.bat index 29f57c0d4c6..29dee044751 100644 --- a/src/tools/scripts/run_and_test_website.bat +++ b/src/tools/scripts/run_and_test_website.bat @@ -26,9 +26,10 @@ echo "Building website" call npm run generate echo "Starting website" +# Can remove -Xutf8 argument after Python 3.15 is everywhere - https://peps.python.org/pep-0686/ start python -Xutf8 main.py rem # Sleep for 5 seconds to make sure server is up -timeout /t 5 /nobreak +timeout 5 /nobreak rem # Use sleep as well in case running in GitBash where above command fails sleep 5 From ea9182c0bbb5adf526315d1894d7ad2c54c1a3b0 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Mon, 25 Nov 2024 16:54:00 +0000 Subject: [PATCH 3/3] Syntax fixes --- src/tools/scripts/run_and_test_website.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/scripts/run_and_test_website.bat b/src/tools/scripts/run_and_test_website.bat index 29dee044751..63b430d4469 100644 --- a/src/tools/scripts/run_and_test_website.bat +++ b/src/tools/scripts/run_and_test_website.bat @@ -26,10 +26,10 @@ echo "Building website" call npm run generate echo "Starting website" -# Can remove -Xutf8 argument after Python 3.15 is everywhere - https://peps.python.org/pep-0686/ +rem # Can remove -Xutf8 argument after Python 3.15 is everywhere - https://peps.python.org/pep-0686/ start python -Xutf8 main.py rem # Sleep for 5 seconds to make sure server is up -timeout 5 /nobreak +timeout /t 5 /nobreak rem # Use sleep as well in case running in GitBash where above command fails sleep 5