Upgrade cibuildwheel to 2.4.0

.github/workflows/python-package.yml

@@ -49,7 +49,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        #os: [ macos-latest, windows-latest, ubuntu-latest ]
+        os: [ macos-latest, windows-latest ]
+
     steps:
       - uses: actions/checkout@v3
         with:
@@ -70,7 +72,7 @@ jobs:
           platforms: arm64
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.4.0
         env:
           # these options are all specific to running in the CI. other options are in pyproject.toml
           MACOSX_DEPLOYMENT_TARGET: "10.15"
@@ -86,7 +88,7 @@ jobs:
 
   publish:
     name: Publish to PyPI and Github
-    needs: [build-wheels, build-sdist]
+    needs: [ build-wheels, build-sdist ]
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
 

pyproject.toml

@@ -57,7 +57,8 @@ package-dir = { '' = '.' } # without this line, C++ source files get included in
 [tool.cibuildwheel]
 build = "cp{37,38,39,31*}-*"
 skip = ["*cp37-musllinux*", "*musllinux_aarch64*", "cp{38,39,31*}-macosx_x86_64"]
-test-command = 'python -m unittest discover "{project}/tests/" --verbose'
+build-frontend = "build"
+test-command = 'cd {project} && python -m unittest --verbose'
 test-extras = ["tests"]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"

tests/__init__.py

@@ -1,4 +1,3 @@
 import os.path
-import unittest
 
 images_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'images')

tests/test_bc1.py

@@ -1,9 +1,7 @@
 import unittest
-import os.path
 from parameterized import parameterized, parameterized_class
-import quicktex
 from quicktex.s3tc.bc1 import BC1Block, BC1Texture, BC1Encoder, BC1Decoder
-from tests.images import BC1Blocks, image_path
+from .images import BC1Blocks
 from PIL import Image, ImageChops
 
 in_endpoints = ((253, 254, 255), (65, 70, 67))  # has some small changes that should encode the same

tests/test_bc4.py

@@ -1,7 +1,7 @@
 import unittest
 from parameterized import parameterized, parameterized_class
 from quicktex.s3tc.bc4 import BC4Block, BC4Texture, BC4Encoder, BC4Decoder
-from tests.images import BC4Blocks
+from .images import BC4Blocks
 from PIL import Image, ImageChops
 
 

tests/test_texture.py

@@ -1,6 +1,6 @@
 import unittest
 import os.path
-from tests.images import image_path
+from .images import image_path
 from quicktex import RawTexture
 from PIL import Image