Improve build (#1272)

* Remove unused imports

These are defined in pyproject.toml

* Update bdist_wheel import

* Fix archive creation

Author: gentlegiantJGC

.github/workflows/python-build.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine pyinstaller~=6.18 build
+        pip install twine pyinstaller~=6.18 build
 
     - name: Setup
       run: |
@@ -41,19 +41,7 @@ jobs:
 
     - name: PyInstaller build
       run: |
-        built_path=Amulet-v${{ github.event.release.tag_name }}-$RUNNER_OS-${{ matrix.cfg.architecture }}.zip
-        echo "BUILT_PATH=$built_path" >> $GITHUB_ENV
         python -m PyInstaller -y Amulet.spec
-        cd dist
-        if [ "$RUNNER_OS" == "Windows" ]; then
-          7z a $built_path Amulet
-        elif [ "$RUNNER_OS" == "macOS" ]; then
-          zip -r $built_path Amulet
-        else
-          echo "$RUNNER_OS not supported"
-          exit 1
-        fi
-        cd ..
 
     - name: Publish to PyPi
       env:
@@ -65,5 +53,5 @@ jobs:
     - name: Upload Release Asset
       uses: actions/upload-artifact@v4
       with:
-        name: ${{env.BUILT_PATH}}
-        path: ./dist/${{env.BUILT_PATH}}
+        name: Amulet-${{ github.event.release.tag_name }}-$RUNNER_OS-${{ matrix.cfg.architecture }}.zip
+        path: ./dist/Amulet

pyproject.toml

@@ -1,7 +1,6 @@
 [build-system]
 requires = [
     "setuptools >= 42",
-    "wheel",
     "cython >= 3.0.0a9",
     "versioneer",
     "numpy ~= 1.17"

setup.py

@@ -1,6 +1,6 @@
 from typing import List, Tuple
 from setuptools import setup, find_packages
-from wheel.bdist_wheel import bdist_wheel
+from setuptools.command.bdist_wheel import bdist_wheel
 from Cython.Build import cythonize
 import glob
 import sys