Update Makefile and GitHub Actions to use pixi for testing and linting

Author: andialbrecht

.github/workflows/python-app.yml

@@ -1,4 +1,4 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# This workflow will install Python dependencies, run tests and lint using pixi
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
 name: Python application
@@ -14,34 +14,40 @@ on:
 
 jobs:
   test:
-    name: Run tests on ${{ matrix.py }}
-    runs-on: ubuntu-latest
+    name: Run tests on Python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        py:
-          - "3.13"
-          - "3.12"
-          - "3.11"
-          - "3.10"
-          - "3.9"
-          - "3.8"
-          - "pypy-3.10"
-          - "pypy-3.9"
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: [ubuntu-latest]
+        include:
+          # Test on additional platforms for latest Python
+          - python-version: "3.11"
+            os: macos-latest
+          - python-version: "3.11"
+            os: windows-latest
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.py }}
-      uses: actions/setup-python@v5
+
+    - name: Setup pixi
+      uses: prefix-dev/setup-pixi@v0.8.1
       with:
-        python-version: ${{ matrix.py }}
-        allow-prereleases: true
-        check-latest: true
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip hatch
-    - name: Lint with flake8
-      run: hatch run flake8
-    - name: Test with pytest and coverage
-      run: hatch run cov
+        pixi-version: v0.55.0
+        cache: true
+
+    - name: Install dependencies and run tests
+      run: pixi run test-py${{ matrix.python-version | replace('.', '') }}
+
+    - name: Run lint (Python 3.11 only)
+      if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
+      run: pixi run lint
+
+    - name: Generate coverage report (Python 3.11 only)
+      if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
+      run: pixi run -e py311 coverage && pixi run -e py311 coverage-combine && pixi run -e py311 coverage-xml
+
     - name: Publish to codecov
+      if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
       uses: codecov/codecov-action@v4

.gitignore

@@ -7,4 +7,6 @@ MANIFEST
 .cache/
 *.egg-info/
 htmlcov/
-.pytest_cache
+.pytest_cache# pixi environments
+.pixi/*
+!.pixi/config.toml

Makefile

@@ -10,10 +10,20 @@ help:
 	@sed -n '/^[a-zA-Z0-9_.]*:/s/:.*//p' <Makefile | sort
 
 test:
-	tox
+	pixi run test-all
+
+lint:
+	pixi run lint
 
 coverage:
-	pytest --cov=sqlparse --cov-report=html --cov-report=term
+	pixi run -e py311 coverage
+	pixi run -e py311 coverage-combine
+	pixi run -e py311 coverage-report
+
+coverage-xml:
+	pixi run -e py311 coverage
+	pixi run -e py311 coverage-combine
+	pixi run -e py311 coverage-xml
 
 clean:
 	$(PYTHON) setup.py clean

pyproject.toml

@@ -41,7 +41,6 @@ sqlformat = "sqlparse.__main__:main"
 
 [project.optional-dependencies]
 dev = [
-    "hatch",
     "build",
 ]
 doc = [
@@ -51,39 +50,6 @@ doc = [
 [tool.hatch.version]
 path = "sqlparse/__init__.py"
 
-[tool.hatch.envs.default]
-dependencies = [
-    "coverage[toml]>=6.5",
-    "pytest",
-    # switch to ruff, but fix problems first
-    # but check defaults!
-    # https://hatch.pypa.io/1.9/config/static-analysis/#default-settings
-    "flake8",
-]
-[tool.hatch.envs.default.scripts]
-unittest = "pytest {args:tests}"
-test-cov = "coverage run -m pytest {args:tests}"
-cov-report = [
-    "- coverage combine",
-    "coverage report",
-]
-cov = [
-    "test-cov",
-    "cov-report",
-]
-check = "flake8 sqlparse/"
-test = ["check", "unittest"]
-
-[[tool.hatch.envs.all.matrix]]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
-[tool.hatch.envs.types]
-dependencies = [
-    "mypy>=1.0.0",
-]
-[tool.hatch.envs.types.scripts]
-check = "mypy --install-types --non-interactive {args:sqlparse tests}"
-
 [tool.coverage.run]
 source_pkgs = ["sqlparse", "tests"]
 branch = true
@@ -102,3 +68,62 @@ exclude_lines = [
     "if __name__ == .__main__.:",
     "if TYPE_CHECKING:",
 ]
+
+[tool.pixi.workspace]
+channels = ["conda-forge"]
+platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]
+
+[tool.pixi.pypi-dependencies]
+sqlparse = { path = ".", editable = true }
+
+[tool.pixi.feature.test.dependencies]
+pytest = "*"
+coverage = "*"
+flake8 = "*"
+
+[tool.pixi.feature.test.pypi-dependencies]
+sqlparse = { path = ".", editable = true }
+
+[tool.pixi.feature.py38.dependencies]
+python = "3.8.*"
+
+[tool.pixi.feature.py39.dependencies]
+python = "3.9.*"
+
+[tool.pixi.feature.py310.dependencies]
+python = "3.10.*"
+
+[tool.pixi.feature.py311.dependencies]
+python = "3.11.*"
+
+[tool.pixi.feature.py312.dependencies]
+python = "3.12.*"
+
+[tool.pixi.feature.py313.dependencies]
+python = "3.13.*"
+
+
+[tool.pixi.environments]
+default = { solve-group = "default" }
+dev = { features = ["dev"], solve-group = "default" }
+doc = { features = ["doc"], solve-group = "default" }
+py38 = { features = ["test", "py38"], solve-group = "py38" }
+py39 = { features = ["test", "py39"], solve-group = "py39" }
+py310 = { features = ["test", "py310"], solve-group = "py310" }
+py311 = { features = ["test", "py311"], solve-group = "py311" }
+py312 = { features = ["test", "py312"], solve-group = "py312" }
+py313 = { features = ["test", "py313"], solve-group = "py313" }
+
+[tool.pixi.tasks]
+test-py38 = "pixi run -e py38 pytest tests/"
+test-py39 = "pixi run -e py39 pytest tests/"
+test-py310 = "pixi run -e py310 pytest tests/"
+test-py311 = "pixi run -e py311 pytest tests/"
+test-py312 = "pixi run -e py312 pytest tests/"
+test-py313 = "pixi run -e py313 pytest tests/"
+test-all = { depends-on = ["test-py38", "test-py39", "test-py310", "test-py311", "test-py312", "test-py313"] }
+lint = "pixi run -e py311 flake8 sqlparse/"
+coverage = "coverage run -m pytest tests/"
+coverage-combine = "coverage combine"
+coverage-report = "coverage report"
+coverage-xml = "coverage xml"