Switch to Python 3.10.9, because PySide6 does not support 3.11 yet

4 files changed, 19 insertions, 19 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 282a96a8..b13cd2d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install poetry
-        run: C:\hostedtoolcache\windows\Python\3.11.1\x64\python -m pip install poetry
+        run: C:\hostedtoolcache\windows\Python\3.10.9\x64\python -m pip install poetry
 
       - name: Restore cache - poetry
         uses: actions/cache@v3
@@ -26,8 +26,8 @@ jobs:
       - name: Install poetry dependencies
         run: |
           cd desktop
-          C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry install
-          C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry env list --full-path
+          C:\hostedtoolcache\windows\Python\3.10.9\x64\Scripts\poetry install
+          C:\hostedtoolcache\windows\Python\3.10.9\x64\Scripts\poetry env list --full-path
 
       - name: Restore cache - tor
         uses: actions/cache@v3
@@ -36,7 +36,7 @@ jobs:
           key: ${{ runner.os }}-win64-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
 
       - name: Get tor binaries from Tor Browser (64-bit)
-        run: cd desktop && C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry run python .\scripts\get-tor.py win64
+        run: cd desktop && C:\hostedtoolcache\windows\Python\3.10.9\x64\Scripts\poetry run python .\scripts\get-tor.py win64
 
       - name: Restore cache - obfs4proxy
         uses: actions/cache@v3
@@ -89,13 +89,13 @@ jobs:
       - name: Build OnionShare
         run: |
           cd desktop
-          C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry run python .\setup-freeze.py build
-          C:\hostedtoolcache\windows\Python\3.11.1\x64\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
+          C:\hostedtoolcache\windows\Python\3.10.9\x64\Scripts\poetry run python .\setup-freeze.py build
+          C:\hostedtoolcache\windows\Python\3.10.9\x64\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
 
       - name: Compress
         shell: pwsh
         run: |
-          mv desktop\build\exe.win-amd64-3.11\ ~\onionshare-win64
+          mv desktop\build\exe.win-amd64-3.10\ ~\onionshare-win64
           Compress-Archive -LiteralPath ~\onionshare-win64 -DestinationPath ~\onionshare-win64.zip
 
       - uses: actions/upload-artifact@v3
@@ -109,7 +109,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install poetry
-        run: C:\hostedtoolcache\windows\Python\3.11.1\x86\python -m pip install poetry
+        run: C:\hostedtoolcache\windows\Python\3.10.9\x86\python -m pip install poetry
 
       - name: Restore cache - poetry
         uses: actions/cache@v3
@@ -120,8 +120,8 @@ jobs:
       - name: Install poetry dependencies
         run: |
           cd desktop
-          C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry install
-          C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry env list --full-path
+          C:\hostedtoolcache\windows\Python\3.10.9\x86\Scripts\poetry install
+          C:\hostedtoolcache\windows\Python\3.10.9\x86\Scripts\poetry env list --full-path
 
       - name: Restore cache - tor
         uses: actions/cache@v3
@@ -130,7 +130,7 @@ jobs:
           key: ${{ runner.os }}-win32-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
 
       - name: Get tor binaries from Tor Browser (32-bit)
-        run: cd desktop && C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry run python .\scripts\get-tor.py win32
+        run: cd desktop && C:\hostedtoolcache\windows\Python\3.10.9\x86\Scripts\poetry run python .\scripts\get-tor.py win32
 
       - name: Install golang (32-bit)
         shell: pwsh
@@ -193,13 +193,13 @@ jobs:
       - name: Build OnionShare
         run: |
           cd desktop
-          C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry run python .\setup-freeze.py build
-          C:\hostedtoolcache\windows\Python\3.11.1\x86\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
+          C:\hostedtoolcache\windows\Python\3.10.9\x86\Scripts\poetry run python .\setup-freeze.py build
+          C:\hostedtoolcache\windows\Python\3.10.9\x86\Scripts\poetry run python .\scripts\build-windows.py cleanup-build
 
       - name: Compress
         shell: pwsh
         run: |
-          mv desktop\build\exe.win32-3.11\ ~\onionshare-win32
+          mv desktop\build\exe.win32-3.10\ ~\onionshare-win32
           Compress-Archive -LiteralPath ~\onionshare-win32 -DestinationPath ~\onionshare-win32.zip
 
       - uses: actions/upload-artifact@v3
@@ -215,9 +215,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install Python 3.11.1 (universal2)
+      - name: Install Python 3.10.9 (universal2)
         run: |
-          curl -L https://www.python.org/ftp/python/3.11.1/python-3.11.1-macos11.pkg --output ~/Downloads/python.pkg
+          curl -L https://www.python.org/ftp/python/3.10.9/python-3.10.9-macos11.pkg --output ~/Downloads/python.pkg
           sudo installer -pkg ~/Downloads/python.pkg -target /
 
       - name: Install poetry
diff --git a/desktop/README.md b/desktop/README.md
index 99c612f9..2b478d96 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -9,7 +9,7 @@ git clone https://github.com/onionshare/onionshare.git
 cd onionshare/desktop
 ```
 
-Make sure you have Python 3 installed. If you're using Windows or macOS, install the latest version of 3.11 [from python.org](https://www.python.org/downloads/). For Windows, make sure to check the box to add python to the path on the first page of the installer.
+Make sure you have Python 3 installed. If you're using Windows or macOS, install the latest version of 3.10 [from python.org](https://www.python.org/downloads/). For Windows, make sure to check the box to add python to the path on the first page of the installer.
 
 Make sure you have [poetry](https://python-poetry.org/) installed:
 
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
index db782200..6d4957a4 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
 
 [tool.poetry.dependencies]
-python = ">=3.7,<3.12"
+python = ">=3.7,<3.11"
 onionshare_cli = {path = "../cli", develop = true}
 PySide6 = "6.4.0"
 qrcode = "*"
diff --git a/desktop/scripts/build-windows.py b/desktop/scripts/build-windows.py
index 9c8713a6..4f43b343 100644
--- a/desktop/scripts/build-windows.py
+++ b/desktop/scripts/build-windows.py
@@ -22,7 +22,7 @@ def get_build_path():
         python_arch = "win-amd64"
     else:
         python_arch = "win32"
-    return os.path.join(desktop_dir, "build", f"exe.{python_arch}-3.11")
+    return os.path.join(desktop_dir, "build", f"exe.{python_arch}-3.10")
 
 
 def get_size(dir):