diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b6ba7bc..9617973 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -29,16 +29,13 @@ jobs: - pydevd - pyinstrument - PyYAML - - shapely + - pyclipper - yappi - zope.interface steps: - uses: actions/checkout@v4 - # temporary fix needed for shapely - - run: apt-get update && apt-get install -y bzip2 - # temporary fix - run: /build/venv/bin/cross-python -m pip config set global.extra-index-url https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-2025/simple @@ -82,7 +79,7 @@ jobs: run: | /build/venv/bin/cross-python whl_mod.py ${{ matrix.package }} ${{ steps.build.outputs.wheel }} ls dist/* - + # Some packages are stupid - name: Remove extra wheels if: steps.check.outputs.should_build == 'true' diff --git a/packages.toml b/packages.toml index 1496e1c..fa3b12a 100644 --- a/packages.toml +++ b/packages.toml @@ -77,18 +77,13 @@ build_pip_requirements = [ # [packages.scipy] # version = "1.5.3" -[packages.shapely] -version = "1.8.5" +[packages.pyclipper] +version = "1.3.0.post6" build_pip_requirements = [ "setuptools", "Cython>=3.0", - "numpy", + "setuptools_scm==7.1.0", ] -pre_script = "scripts/build_geos.sh" - -[packages.shapely.environment] -GEOS_CONFIG = "/usr/local/arm-nilrt-linux-gnueabi/sysroot/usr/bin/geos-config" - [packages."zope.interface"] version = "7.1.0" diff --git a/scripts/build_geos.sh b/scripts/build_geos.sh deleted file mode 100755 index e3959ea..0000000 --- a/scripts/build_geos.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e - -/build/venv/bin/build-pip install cmake ninja - -[ -f geos-3.13.0.tar.bz2 ] || wget https://download.osgeo.org/geos/geos-3.13.0.tar.bz2 -[ -d geos-3.13.0 ] || tar -xf geos-3.13.0.tar.bz2 - -cd geos-3.13.0/ - -mkdir build -cd build -/build/venv/build/bin/cmake \ - -DCMAKE_TOOLCHAIN_FILE=../../roborio-toolchain.cmake \ - -DCMAKE_MAKE_PROGRAM=/build/venv/build/bin/ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/local/arm-nilrt-linux-gnueabi/sysroot/usr \ - -DBUILD_DOCUMENTATION=OFF \ - -DBUILD_TESTING=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -G Ninja \ - .. - -/build/venv/build/bin/cmake --build . -/build/venv/build/bin/cmake --install .