diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 172721a..2ea394d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - run: pip install poetry - run: poetry install - name: Run CLI tests @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - run: pip install poetry - run: poetry install - name: Run CLI tests diff --git a/BUILD.md b/BUILD.md index 1870532..fb55f43 100644 --- a/BUILD.md +++ b/BUILD.md @@ -320,7 +320,7 @@ template for development is if: Install [Docker Desktop](https://www.docker.com/products/docker-desktop). Make sure to choose your correct CPU, either Intel Chip or Apple Chip. -Install the latest version of Python 3.11 [from python.org](https://www.python.org/downloads/macos/), and make sure `/Library/Frameworks/Python.framework/Versions/3.11/bin` is in your `PATH`. +Install the latest version of Python 3.12 [from python.org](https://www.python.org/downloads/macos/), and make sure `/Library/Frameworks/Python.framework/Versions/3.12/bin` is in your `PATH`. Clone this repository: @@ -379,7 +379,7 @@ The output is in the `dist` folder. Install [Docker Desktop](https://www.docker.com/products/docker-desktop). -Install the latest version of Python 3.11 (64-bit) [from python.org](https://www.python.org/downloads/windows/). Make sure to check the "Add Python 3.11 to PATH" checkbox on the first page of the installer. +Install the latest version of Python 3.12 (64-bit) [from python.org](https://www.python.org/downloads/windows/). Make sure to check the "Add Python 3.12 to PATH" checkbox on the first page of the installer. Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build Tools"](https://visualstudio.microsoft.com/visual-cpp-build-tools/) and make sure to select "Desktop development with C++" when installing. @@ -440,7 +440,7 @@ Open a command prompt, cd into the dangerzone directory, and run: poetry run python .\setup-windows.py build ``` -In `build\exe.win32-3.11\` you will find `dangerzone.exe`, `dangerzone-cli.exe`, and all supporting files. +In `build\exe.win32-3.12\` you will find `dangerzone.exe`, `dangerzone-cli.exe`, and all supporting files. ### To build the installer diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index b98c6d9..ac3c4c9 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -364,7 +364,7 @@ CONTENT_BUILD_WINDOWS = r"""## Windows Install [Docker Desktop](https://www.docker.com/products/docker-desktop). -Install the latest version of Python 3.11 (64-bit) [from python.org](https://www.python.org/downloads/windows/). Make sure to check the "Add Python 3.11 to PATH" checkbox on the first page of the installer. +Install the latest version of Python 3.12 (64-bit) [from python.org](https://www.python.org/downloads/windows/). Make sure to check the "Add Python 3.12 to PATH" checkbox on the first page of the installer. Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build Tools"](https://visualstudio.microsoft.com/visual-cpp-build-tools/) and make sure to select "Desktop development with C++" when installing. diff --git a/install/windows/build-app.bat b/install/windows/build-app.bat index 1dd340e..ffdc60d 100644 --- a/install/windows/build-app.bat +++ b/install/windows/build-app.bat @@ -6,8 +6,8 @@ REM build the exe python .\setup-windows.py build REM code sign dangerzone.exe -signtool.exe sign /v /d "Dangerzone" /a /n "Freedom of the Press Foundation" /fd sha1 /t http://time.certum.pl/ build\exe.win-amd64-3.11\dangerzone.exe -signtool.exe sign /v /d "Dangerzone" /a /n "Freedom of the Press Foundation" /fd sha1 /t http://time.certum.pl/ build\exe.win-amd64-3.11\dangerzone-cli.exe +signtool.exe sign /v /d "Dangerzone" /a /n "Freedom of the Press Foundation" /fd sha1 /t http://time.certum.pl/ build\exe.win-amd64-3.12\dangerzone.exe +signtool.exe sign /v /d "Dangerzone" /a /n "Freedom of the Press Foundation" /fd sha1 /t http://time.certum.pl/ build\exe.win-amd64-3.12\dangerzone-cli.exe REM build the wix file python install\windows\build-wxs.py > build\Dangerzone.wxs diff --git a/install/windows/build-wxs.py b/install/windows/build-wxs.py index abc7a15..0cf685e 100644 --- a/install/windows/build-wxs.py +++ b/install/windows/build-wxs.py @@ -23,12 +23,12 @@ def build_data(dirname, dir_prefix, id_, name): id_prefix = id_ # Skip lib/PySide6/examples folder due to ilegal file names - if "\\build\\exe.win-amd64-3.11\\lib\\PySide6\\examples" in dirname: + if "\\build\\exe.win-amd64-3.12\\lib\\PySide6\\examples" in dirname: continue # Skip lib/PySide6/qml/QtQuick folder due to ilegal file names # XXX Since we're not using Qml it should be no problem - if "\\build\\exe.win-amd64-3.11\\lib\\PySide6\\qml\\QtQuick" in dirname: + if "\\build\\exe.win-amd64-3.12\\lib\\PySide6\\qml\\QtQuick" in dirname: continue id_value = f"{id_prefix}{basename.capitalize().replace('-', '_')}" @@ -128,7 +128,7 @@ def main(): dist_dir = os.path.join( os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "build", - "exe.win-amd64-3.11", + "exe.win-amd64-3.12", ) if not os.path.exists(dist_dir): print("You must build the dangerzone binary before running this") @@ -152,7 +152,7 @@ def main(): data["dirs"][0]["dirs"].append( build_data( dist_dir, - "exe.win-amd64-3.11", + "exe.win-amd64-3.12", "INSTALLDIR", "Dangerzone", ) diff --git a/pyproject.toml b/pyproject.toml index 8b4a350..2102d52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dangerzone-cli = 'dangerzone:main' # Dependencies required for packaging the code on various platforms. [tool.poetry.group.package.dependencies] setuptools = "*" -cx_freeze = {version = "^6.13.1", platform = "win32"} +cx_freeze = {version = "^7.1.1", platform = "win32"} pywin32 = {version = "*", platform = "win32"} pyinstaller = {version = "*", platform = "darwin"}