Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/django-filter-gte-23.2-and-…
Browse files Browse the repository at this point in the history
…lt-25.0
  • Loading branch information
nemesifier authored Aug 2, 2024
2 parents 33927a1 + 4386512 commit 00193ba
Show file tree
Hide file tree
Showing 34 changed files with 1,265 additions and 1,228 deletions.
5 changes: 3 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[run]
source = openwisp_utils
parallel = true
concurrency = multiprocessing
omit =
/*/test*
/tests
/*/__init__.py
/setup.py
/*/migrations/*
35 changes: 17 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ on:
- dev

jobs:

build:
name: Python==${{ matrix.python-version }} | ${{ matrix.django-version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

strategy:
fail-fast: false
Expand All @@ -30,12 +29,12 @@ jobs:
- django~=4.2.0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -53,27 +52,27 @@ jobs:

- name: Tests
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
run: coverage run --source=openwisp_utils runtests.py
run: |
coverage run runtests.py --parallel
coverage combine
coverage xml
env:
SELENIUM_HEADLESS: 1

- name: Upload Coverage
if: ${{ success() }}
run: coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: python-${{ matrix.python-version }}-${{ matrix.django-version }}
COVERALLS_PARALLEL: true
uses: coverallsapp/github-action@v2
with:
parallel: true
format: cobertura
flag-name: python-${{ matrix.env.env }}
github-token: ${{ secrets.GITHUB_TOKEN }}

coveralls:
name: Finish Coveralls
needs: build
runs-on: ubuntu-latest
container: python:3-slim
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls
coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Coveralls Finished
uses: coverallsapp/github-action@v2
with:
parallel-finished: true
Loading

0 comments on commit 00193ba

Please sign in to comment.