diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 928cdc8..f6c9a0c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -11,7 +11,7 @@ on: jobs: test: name: test - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -31,6 +31,8 @@ jobs: python -m pip install -r build-requirements.txt - name: "Install pyvroom" + env: + CXX: g++-14 run: | # Because `pip install -e .` does not play nice with gcov, we go old school: CFLAGS="-coverage" python setup.py build_ext --inplace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2636e49..fd4e978 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,16 +83,16 @@ jobs: uses: pypa/cibuildwheel@v2.19.2 env: MACOSX_DEPLOYMENT_TARGET: 13.0 - CC: gcc-13 - CXX: g++-13 + CC: gcc-14 + CXX: g++-14 - name: Build wheels if: matrix.platform == 'macos-arm' uses: pypa/cibuildwheel@v2.19.2 env: MACOSX_DEPLOYMENT_TARGET: 14.0 - CC: gcc-13 - CXX: g++-13 + CC: gcc-14 + CXX: g++-14 - name: Verify clean directory run: git diff --exit-code diff --git a/pyproject.toml b/pyproject.toml index dddddfa..6a4d67a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,6 @@ requires = [ "setuptools>=45", "wheel", - "setuptools_scm>=6.2", - "setuptools_scm_git_archive", "pybind11>=2.8.0", ]