diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 0e060b8f0..5d982e6a6 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -39,18 +39,18 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install Dependencies run: | - python -m pip install --upgrade 'coveralls>=3' pip + python -m pip install --upgrade pip python -m pip install --upgrade --requirement requirements/tests.txt - python -m pip install --editable . + python -m pip install . - name: Run Tests run: | make test - name: Upload Coverage - run: coveralls --service=github - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: tests-${{ matrix.python-version }}-${{ matrix.os }} - COVERALLS_PARALLEL: true + uses: coverallsapp/github-action@v2 + with: + flag-name: tests-${{ matrix.python-version }}-${{ matrix.os }} + parallel: true + path-to-lcov: coverage.lcov build: name: Build Distribution @@ -66,8 +66,9 @@ jobs: python-version: '3.11' - name: Install Dependencies run: | - python -m pip install --upgrade build pip polib - pip install --upgrade . + python -m pip install --upgrade pip + python -m pip install --upgrade build polib + pip install . - name: Build Distribution run: | make package @@ -77,19 +78,15 @@ jobs: name: dist path: dist - coveralls: name: Finish Coveralls needs: [test] runs-on: ubuntu-latest - container: python:3-slim steps: - name: Finished - run: | - python -m pip install --upgrade 'coveralls>=3' pip - coveralls --finish --service=github - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true deploy: name: Deploy diff --git a/.gitignore b/.gitignore index 3e318164d..4ee1bd806 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ MANIFEST *.pot *.pyc *.DS_Store -coverage.xml +coverage.lcov .tox .venv docs/build diff --git a/Makefile b/Makefile index 5bf8a02f6..19bbbce8f 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ setup: test: scripts/l10n/generate_mo_files.py - pytest --cov=. --cov-config=pyproject.toml --cov-report term --cov-report xml --durations 10 --durations-min=0.75 --dist loadscope --no-cov-on-fail --numprocesses auto + pytest --cov=. --cov-config=pyproject.toml --cov-report term --cov-report lcov --durations 10 --durations-min=0.75 --dist loadscope --no-cov-on-fail --numprocesses auto tox: tox --parallel auto diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 5760b58e1..71596c751 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,5 +1,4 @@ # Package runtime requirements. -convertdate>=2.3.0 hijri-converter korean-lunar-calendar python-dateutil diff --git a/requirements/tests.txt b/requirements/tests.txt index 1b55ef8be..a15cfbe9f 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,5 +1,5 @@ # Test requirements. -coverage[toml]<7.0.0 +coverage pytest pytest-cov pytest-xdist