diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9655039f..6a30acf65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,8 +46,11 @@ jobs: - name: Setup SocketCAN if: ${{ matrix.os == 'ubuntu-latest' }} run: | - sudo apt-get update - sudo apt-get -y install linux-modules-extra-$(uname -r) + # Ubuntu 26.04 ships vcan in linux-modules, older releases need linux-modules-extra + if ! modinfo vcan > /dev/null 2>&1; then + sudo apt-get update + sudo apt-get -y install linux-modules-extra-$(uname -r) + fi sudo ./test/open_vcan.sh - name: Test with pytest via tox run: | @@ -57,7 +60,7 @@ jobs: # See: https://github.com/pypy/pypy/issues/3808 TEST_SOCKETCAN: "${{ matrix.os == 'ubuntu-latest' && ! startsWith(matrix.env, 'pypy' ) }}" - name: Coveralls Parallel - uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # 2.3.7 + uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # 2.3.8 with: github-token: ${{ secrets.github_token }} flag-name: Unittests-${{ matrix.os }}-${{ matrix.env }} @@ -73,7 +76,7 @@ jobs: fetch-depth: 0 persist-credentials: false - name: Coveralls Finished - uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # 2.3.7 + uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # 2.3.8 with: github-token: ${{ secrets.github_token }} parallel-finished: true diff --git a/pyproject.toml b/pyproject.toml index 9dd55f8df..6694cc2bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,6 +103,8 @@ test = [ "pytest-cov==7.1.*", "coverage==7.14.*", "hypothesis==6.*", + # hypothesis>=6.156 needs a Rust extension that does not support PyPy 3.10 + "hypothesis<6.156;platform_python_implementation=='PyPy' and python_version<'3.11'", "parameterized==0.9.*", ] dev = [