Update to RocketSim 2.2

Author: mtheall

.github/workflows/main.yml

@@ -5,6 +5,7 @@ on:
     tags:
       - v*
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,14 +17,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, ubuntu-22.04, macos-13]
+        os: [windows-2022, ubuntu-22.04, macos-14]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.11'
           cache: 'pip'
 
       - name: Install dependencies
@@ -37,7 +38,7 @@ jobs:
           python3 -m pip wheel . -w dist
           for old in dist/rocketsim-*.whl
           do
-            new=$(echo $old | sed -E 's/-(cp[0-9]+)-cp[0-9]+-/-\1-abi3-/g')
+            new=$(echo $old | sed -E 's/-(cp[0-9]+)-cp[0-9]+-/-cp39-abi3-/g')
             mv $old $new
           done
 
@@ -47,13 +48,11 @@ jobs:
           python3 -m cibuildwheel --output-dir dist
           for old in dist/rocketsim-*.whl
           do
-            new=$(echo $old | sed -E 's/-(cp[0-9]+)-cp[0-9]+-.*\.whl/-\1-abi3-manylinux2014_x86_64.whl/g')
+            new=$(echo $old | sed -E 's/-(cp[0-9]+)-cp[0-9]+-.*\.whl/-cp39-abi3-manylinux2014_x86_64.whl/g')
             mv $old $new
           done
-        env:
-          CIBW_BUILD: cp39-manylinux_x86_64
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: wheel-${{ matrix.os }}
           path: dist/rocketsim-*.whl
@@ -63,14 +62,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: build_wheel
     strategy:
+      fail-fast: false
       matrix:
-        os: [windows-2019, ubuntu-22.04, macos-13]
-        pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        os: [windows-2022, ubuntu-22.04, macos-14]
+        pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.pyversion }}
           cache: 'pip'
@@ -80,7 +80,7 @@ jobs:
           pip3 install numpy PyGLM
 
       - name: Download artifact ${{ matrix.os }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: wheel-${{ matrix.os }}
           path: dist
@@ -91,7 +91,7 @@ jobs:
           pip3 install dist/rocketsim-*.whl
 
       - name: Load collision meshes
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         id: collision-cache-restore
         with:
           path: collision_meshes
@@ -100,20 +100,13 @@ jobs:
 
       - name: Download collision meshes
         if: steps.collision-cache-restore.outputs.cache-hit != 'true'
-        uses: suisei-cn/actions-download-file@v1.3.0
-        with:
-          url: https://mtheall.com/~mtheall/collision_meshes.tar
-
-      - name: Extract collision meshes
-        if: steps.collision-cache-restore.outputs.cache-hit != 'true'
-        uses: a7ul/tar-action@v1.1.3
-        with:
-          command: x
-          files: collision_meshes.tar
+        run: |
+          curl -o collision_meshes.tar ${{ secrets.COLLISION_MESHES_URL }}
+          tar -xf collision_meshes.tar
 
       - name: Save collision meshes
         if: steps.collision-cache-restore.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: collision_meshes
           key: collision-cache
@@ -138,22 +131,22 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - name: Download artifact windows-2019
-        uses: actions/download-artifact@v4
+      - name: Download artifact windows-2022
+        uses: actions/download-artifact@v7
         with:
-          name: wheel-windows-2019
+          name: wheel-windows-2022
           path: dist
 
       - name: Download artifact ubuntu-22.04
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: wheel-ubuntu-22.04
           path: dist
 
-      - name: Download artifact macos-13
-        uses: actions/download-artifact@v4
+      - name: Download artifact macos-14
+        uses: actions/download-artifact@v7
         with:
-          name: wheel-macos-13
+          name: wheel-macos-14
           path: dist
 
       - name: Publish package distributions to PyPI

CMakeLists.txt

@@ -11,27 +11,7 @@ file(GLOB_RECURSE ROCKETSIM_BULLET3_SOURCES libsrc/bullet3-3.24/*.cpp)
 file(GLOB_RECURSE ROCKETSIM_SOURCES src/*.cpp)
 file(GLOB ROCKETSIM_PYTHON_SOURCES python-mtheall/*.cpp)
 
-add_library(${PROJECT_NAME} MODULE)
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
-	PREFIX ""
-)
-
-if(WIN32)
-	set_target_properties(${PROJECT_NAME} PROPERTIES
-		OUTPUT_NAME ${PROJECT_NAME}
-	)
-
-	if(NOT CYGWIN)
-		set_target_properties(${PROJECT_NAME} PROPERTIES
-			SUFFIX .pyd
-		)
-	endif()
-else()
-	set_target_properties(${PROJECT_NAME} PROPERTIES
-		OUTPUT_NAME ${PROJECT_NAME}.${Python3_SOSABI}
-	)
-endif()
+Python3_add_library(${PROJECT_NAME} MODULE USE_SABI "3.9" WITH_SOABI)
 
 target_sources(${PROJECT_NAME} PRIVATE
 	${ROCKETSIM_BULLET3_SOURCES}
@@ -63,7 +43,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Python3::SABIModule Python3::NumPy
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
 	PY_SSIZE_T_CLEAN=1
-	Py_LIMITED_API=0x03090000
 	NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
 	PY_ARRAY_UNIQUE_SYMBOL=RocketSim_ARRAY_API
 	NO_IMPORT_ARRAY=1

pyproject.toml

@@ -1,14 +1,18 @@
 [project]
 name            = "RocketSim"
-version         = "2.1.1.post4"
+version         = "2.2.0"
 description     = "This is Rocket League!"
 dependencies    = ["numpy"]
 requires-python = ">= 3.9"
 
 [build-system]
 requires      = ["cmeel[build]", "numpy>=2.0,<3"]
 build-backend = "cmeel"
-backend-path  = "."
+backend-path  = ["."]
 
 [tool.cmeel]
 run-tests = false
+
+[tool.cibuildwheel]
+build = "cp39-*"
+skip = "*-musllinux*"