ci overhaul

Author: bimac

.github/workflows/publish.yaml

@@ -9,6 +9,9 @@ jobs:
   build:
     name: Build and upload release to PyPi
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/iblqt
     permissions:
       id-token: write
     steps:

.github/workflows/testing.yaml

@@ -10,28 +10,17 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  Ruff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/ruff-action@v3
-        with:
-          version-file: 'pyproject.toml'
-          args: 'check --output-format=github'
-      - run: 'ruff format --check --diff'
-
-  Testing:
+  tox:
     needs: [Ruff]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
+      - uses: astral-sh/setup-uv@v6
       - name: Install dependencies
-        run: uv sync --no-default-groups --group test --group ci --group typing
+        run: uv sync --no-default-groups --group test --group ci
       - name: Install libegl1 (Ubuntu only)
         if: matrix.os == 'ubuntu-latest'
         uses: awalsh128/cache-apt-pkgs-action@latest
@@ -41,7 +30,12 @@ jobs:
       - name: Run Tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PLATFORM: ${{ matrix.os }}
-          EXTRA_DEPS: ci
-          POST_COMMAND: '- coveralls --submit=${{ env.COVERAGE_FILE }}'
-        run: uv run tox -p auto --parallel-no-spinner
+        run: uv run tox --parallel-no-spinner
+  finish:
+    needs: tox
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: coverallsapp/github-action@v2
+      with:
+        parallel-finished: true

pyproject.toml

@@ -60,6 +60,8 @@ lint = [
   "ruff>=0.9.2",
 ]
 test = [
+  {include-group = "typing"},
+  {include-group = "lint"},
   "pytest>=8.3.4",
   "pytest-cov>=6.0.0",
   "pytest-qt>=4.4.0",
@@ -132,62 +134,3 @@ source = [
   ".tox/py*/lib/py*/site-packages/iblqt/",
   ".tox/py*/Lib/site-packages/iblqt/"
 ]
-
-[tool.tox]
-legacy_tox_ini = """
-[tox]
-env_list = clean,typing,py{310,313}-{pyqt5,pyqt6,pyside6},report
-
-[testenv]
-dependency_groups = test
-runner = uv-venv-lock-runner
-
-[testenv:py{310,313}-{pyqt5,pyqt6,pyside6}]
-depends = clean
-commands =
-  pytest
-  {env:POST_COMMAND:python --version}
-dependency_groups =
-  test
-  {env:EXTRA_DEPS:}
-extras=
-  pyqt5: pyqt5
-  pyqt6: pyqt6
-  pyside6: pyside6
-setenv =
-  py310: PYTHON=py310
-  py313: PYTHON=py313
-  pyqt5: PYTEST_QT_API=pyqt5
-  pyqt6: PYTEST_QT_API=pyqt6
-  pyside6: PYTEST_QT_API=pyside6
-  COVERALLS_FLAG_NAME={env:PLATFORM}_{env:PYTHON}_{env:PYTEST_QT_API}
-  COVERAGE_FILE=.coverage.{env:PYTHON}.{env:PYTEST_QT_API}.xml
-  QTWEBENGINE_CHROMIUM_FLAGS="--disable-gpu"
-  QT_QPA_PLATFORM=offscreen
-  QT_QUICK_BACKEND=software
-  QT_OPENGL=software
-  TOX=true
-passenv=
-  DISPLAY
-  XAUTHORITY
-  COLUMNS
-  GITHUB_*
-  EXTRA_DEPS
-
-[testenv:clean]
-skip_install = true
-commands =
-  coverage erase
-
-[testenv:typing]
-skip_install = true
-dependency_groups = typing
-extras = pyqt5
-commands = mypy --always-true=PYQT5 --always-false=PYQT6 --always-false=PYSIDE6
-
-[testenv:report]
-depends = py{310,313}-{pyqt5,pyqt6,pyside6}
-skip_install = true
-commands =
-  coverage combine
-"""

tox.ini

@@ -0,0 +1,75 @@
+[tox]
+requires = tox >= 4.25.0
+env_list = ruff{posargs},clean,typing,py{310,313}-{pyqt5,pyqt6,pyside6}{posargs},report
+
+[testenv]
+dependency_groups = test
+runner = uv-venv-lock-runner
+setenv =
+   pyqt5: PYTEST_QT_API=pyqt5
+   pyqt6: PYTEST_QT_API=pyqt6
+   pyside6: PYTEST_QT_API=pyside6
+   COVERAGE_FILE = .coverage.{py_dot_ver}.{env:PYTEST_QT_API}
+   QTWEBENGINE_CHROMIUM_FLAGS="--disable-gpu"
+   QT_QPA_PLATFORM=offscreen
+   QT_QUICK_BACKEND=software
+   QT_OPENGL=software
+
+[testenv:ruff{,-ci}]
+description = run ruff linter
+dependency_groups = lint
+commands =
+   ruff: ruff check
+   ruff-ci: ruff check --output-format=github
+   ruff format --check
+skip_install = true
+
+[testenv:typing]
+description = run mypy type checker
+dependency_groups = typing
+commands = mypy
+skip_install = true
+
+[testenv:clean]
+description = clean up coverage files
+commands = coverage erase
+skip_install = true
+
+[testenv:py31{0,3}-{pyqt5,pyqt6,pyside6}]
+description = run pytest on python {py_dot_ver}
+depends = clean
+commands = pytest
+extras=
+   pyqt5: pyqt5
+   pyqt6: pyqt6
+   pyside6: pyside6
+
+[testenv:py31{0,3}-{pyqt5,pyqt6,pyside6}-ci]
+description = run pytest on python {py_dot_ver}
+depends = clean
+dependency_groups =
+   {[testenv]dependency_groups}
+   ci
+extras=
+   pyqt5: pyqt5
+   pyqt6: pyqt6
+   pyside6: pyside6
+commands =
+   pytest
+   coveralls
+setenv =
+   {[testenv]setenv}
+   COVERALLS_FLAG_NAME = {on_platform}_python{py_dot_ver}_{env:PYTEST_QT_API}
+   COVERALLS_PARALLEL = true
+passenv =
+   DISPLAY
+   XAUTHORITY
+   COLUMNS
+   GITHUB_*
+
+[testenv:report]
+description = combine coverage files
+depends = py{310,313}-{pyqt5,pyqt6,pyside6}{posargs}
+setenv = COVERAGE_FILE = .coverage
+commands = coverage combine
+skip_install = true