From b2d63bcb5886beabd07edc39ddfe35ebf52bb4a5 Mon Sep 17 00:00:00 2001 From: Tom David Mueller Date: Wed, 27 Nov 2024 08:04:20 +0100 Subject: [PATCH] finalize tkinter --- .../build-windows-executable-app.yaml | 4 +- .github/workflows/test_embedded_tk.yml | 48 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/test_embedded_tk.yml diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index a4b7f365..253227c9 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -243,11 +243,11 @@ jobs: $PYTHON_DIR="${{ runner.tool_cache }}/Python/${{ env.PYTHON_VERSION }}/x64" # Path from actions/setup-python $EMBED_DIR="python-${{ env.PYTHON_VERSION }}" - mkdir -p $EMBED_DIR/Lib/tkinter + mkdir -p $EMBED_DIR/Lib/site-packages/tkinter mkdir -p $EMBED_DIR/tcl # Copy necessary Tkinter files from the regular Python distribution - cp -r $PYTHON_DIR/Lib/tkinter/* $EMBED_DIR/Lib/tkinter/ + cp -r $PYTHON_DIR/Lib/tkinter/* $EMBED_DIR/Lib/site-packages/tkinter/ cp -r $PYTHON_DIR/tcl/* $EMBED_DIR/tcl/ cp $PYTHON_DIR/DLLs/_tkinter.pyd $EMBED_DIR/ cp $PYTHON_DIR/DLLs/tcl86t.dll $EMBED_DIR/ diff --git a/.github/workflows/test_embedded_tk.yml b/.github/workflows/test_embedded_tk.yml deleted file mode 100644 index a9b5ca42..00000000 --- a/.github/workflows/test_embedded_tk.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Test Embedded - -on: - push: - branches: ["develop", "deploy"] - pull_request: - branches: ["develop", "deploy"] - release: - types: [published] - - -jobs: - build-embedded: - runs-on: windows-latest - - env: - PYTHON_VERSION: 3.11.0 - - steps: - - - name: Set up Python (regular distribution) - uses: actions/setup-python@v4 - with: - python-version: ${{ env.PYTHON_VERSION }} # Use the same version as the embeddable version - - - name: Setup python embeddable version - run: | - # Create a directory for the embeddable Python version - mkdir python-${{ env.PYTHON_VERSION }} - - # Download and unzip the embeddable Python version - curl -O https://www.python.org/ftp/python/${{ env.PYTHON_VERSION }}/python-${{ env.PYTHON_VERSION }}-embed-amd64.zip - unzip python-${{ env.PYTHON_VERSION }}-embed-amd64.zip -d python-${{ env.PYTHON_VERSION }} - rm python-${{ env.PYTHON_VERSION }}-embed-amd64.zip - - # Define paths for the regular Python distribution and the embeddable distribution - $PYTHON_DIR="${{ runner.tool_cache }}/Python/${{ env.PYTHON_VERSION }}/x64" # Path from actions/setup-python - $EMBED_DIR="python-${{ env.PYTHON_VERSION }}" - - mkdir -p $EMBED_DIR/Lib/tkinter - mkdir -p $EMBED_DIR/tcl - - # Copy necessary Tkinter files from the regular Python distribution - cp -r $PYTHON_DIR/Lib/tkinter/* $EMBED_DIR/Lib/tkinter/ - cp -r $PYTHON_DIR/tcl(* $EMBED_DIR/tcl/ - cp $PYTHON_DIR/DLLs/_tkinter.pyd $EMBED_DIR/ - cp $PYTHON_DIR/DLLs/tcl86t.dll $EMBED_DIR/ - cp $PYTHON_DIR/DLLs/tk86t.dll $EMBED_DIR/