From e0e7b8c4b7aa2ab981f64539e417e821ea1a01b1 Mon Sep 17 00:00:00 2001 From: Tyler Fox Date: Fri, 23 Feb 2024 15:58:11 -0800 Subject: [PATCH 1/4] Explicitly set the python version for compiling wheels --- .github/workflows/main.yml | 45 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c289ce4..224f3b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -192,6 +192,11 @@ jobs: submodules: true fetch-depth: 0 + - name: Get Correct Python Version + uses: actions/setup-python@v5 + with: + python-version: '3.7' + - name: Configure CMake run: | cmake -B ${{github.workspace}}/pybuild -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_MAYA=NO -DMAYA_PYTHON=NO -DSYSTEM_PY_VERSION=3 @@ -203,12 +208,12 @@ jobs: - name: Build Wheel run: | - py -3 -m pip install -U pip - py -3 -m pip install -U build wheel hatch - py -3 -m hatch version $(git describe --tags --abbrev=0) - py -3 -m build --wheel + python -m pip install -U pip + python -m pip install -U build wheel hatch + python -m hatch version $(git describe --tags --abbrev=0) + python -m build --wheel $PY_WHEEL = Get-ChildItem -Name dist/*.whl - py -3 -m wheel tags --remove --python-tag cp3 --abi-tag abi3 --platform-tag win_amd64 dist/$PY_WHEEL + python -m wheel tags --remove --python-tag cp37 --abi-tag abi3 --platform-tag win_amd64 dist/$PY_WHEEL - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -229,6 +234,11 @@ jobs: submodules: true fetch-depth: 0 + - name: Get Correct Python Version + uses: actions/setup-python@v5 + with: + python-version: '3.7' + - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '13.4' @@ -244,13 +254,13 @@ jobs: - name: Build Wheel run: | - python3 -m pip install -U pip - python3 -m pip install -U build wheel hatch - python3 -m hatch version $(git describe --tags --abbrev=0) - python3 -m build --wheel + python -m pip install -U pip + python -m pip install -U build wheel hatch + python -m hatch version $(git describe --tags --abbrev=0) + python -m build --wheel for PY_WHEEL in dist/*.whl do - python3 -m wheel tags --remove --python-tag cp3 --abi-tag abi3 --platform-tag macosx_10_9_x86_64 ${PY_WHEEL} + python -m wheel tags --remove --python-tag cp37 --abi-tag abi3 --platform-tag macosx_10_9_x86_64 ${PY_WHEEL} done - name: Upload Artifacts @@ -273,6 +283,11 @@ jobs: submodules: true fetch-depth: 0 + - name: Get Correct Python Version + uses: actions/setup-python@v5 + with: + python-version: '3.7' + - name: Configure CMake run: | cmake -B ${{github.workspace}}/pybuild -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_MAYA=NO -DMAYA_PYTHON=NO -DSYSTEM_PY_VERSION=3 @@ -284,13 +299,13 @@ jobs: - name: Build Wheel run: | - python3 -m pip install -U pip - python3 -m pip install -U build wheel hatch - python3 -m hatch version $(git describe --tags --abbrev=0) - python3 -m build --wheel + python -m pip install -U pip + python -m pip install -U build wheel hatch + python -m hatch version $(git describe --tags --abbrev=0) + python -m build --wheel for PY_WHEEL in dist/*.whl do - python3 -m wheel tags --remove --python-tag cp3 --abi-tag abi3 --platform-tag manylinux_2_17_x86_64 ${PY_WHEEL} + python -m wheel tags --remove --python-tag cp37 --abi-tag abi3 --platform-tag manylinux_2_17_x86_64 ${PY_WHEEL} done - name: Upload Artifacts From 54cd438c3a2b6c2cf9eb5338c3a08587e04ff950 Mon Sep 17 00:00:00 2001 From: Tyler Fox Date: Fri, 23 Feb 2024 16:21:41 -0800 Subject: [PATCH 2/4] Update the release action to an active repo --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 224f3b2..ca1e473 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -368,9 +368,9 @@ jobs: - name: Upload distribution if: ${{ startsWith(github.ref, 'refs/tags/v') }} - uses: "marvinpinto/action-automatic-releases@latest" + uses: softprops/action-gh-release@v1 with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" + token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false files: | *.zip From fdc7183d5fdea0bcc102cf28a7dfb3b807f8fdff Mon Sep 17 00:00:00 2001 From: Tyler Fox Date: Tue, 27 Feb 2024 11:47:31 -0800 Subject: [PATCH 3/4] Because I'm using Qt.py, it's up to the user to choose to install PySide2 or PyQt5 --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 47b1074..dfc7fd5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ dependencies = [ "six", - "PySide2", ] [project.urls] From 17ae19b0ddd42d33d34eef46c63e3141132438c3 Mon Sep 17 00:00:00 2001 From: Tyler Fox Date: Mon, 11 Mar 2024 23:47:12 -0700 Subject: [PATCH 4/4] Make a simple drag/drop installer Don't build a release if only the installer or markdown files are edited --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca1e473..d8f668a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,14 @@ on: branches: [ master ] tags: - v* + paths-ignore: + - '**.md' + - 'simplex_maya_installer.py' pull_request: branches: [ master ] + paths-ignore: + - '**.md' + - 'simplex_maya_installer.py' env: BUILD_TYPE: RelWithDebInfo