diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 99913dad..5e54cfee 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -61,9 +61,6 @@ jobs: run: brew install hdf5 # Helps set up VTK with a headless display - - uses: pyvista/setup-headless-display-action@v3 - - # Sets up ffmpeg to we can run video tests on CI - uses: FedericoCarboni/setup-ffmpeg@v2 if: matrix.os != 'macos-latest' id: setup-ffmpeg @@ -73,11 +70,12 @@ jobs: run: brew install ffmpeg # Run tests - - uses: neuroinformatics-unit/actions/test@v2 + - name: Run tests + uses: neuroinformatics-unit/actions/test-uv@main with: - python-version: ${{ matrix.python-version }} + python-version: "${{ matrix.python-version }}" secret-codecov-token: ${{ secrets.CODECOV_TOKEN }} - + use-headless: 'true' - name: Notify slack on scheduled failure if: failure() && github.event_name == 'schedule' diff --git a/pyproject.toml b/pyproject.toml index 415b4515..c5185a52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,6 @@ dev = [ "pytest", "pytest-cov", "coverage", - "tox", "black", "mypy", "pre-commit", @@ -66,7 +65,6 @@ dev = [ ] nb = ["jupyter", "k3d"] - [build-system] requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" @@ -78,9 +76,8 @@ include-package-data = true include = ["brainrender*"] exclude = ["tests*", "docs*", "examples*", "imgs*"] - [tool.pytest.ini_options] -addopts = "--cov=brainrender" +addopts = "--cov=brainrender --cov-report=xml --color=yes -vv" markers = [ "slow: marks tests as slow (deselect with '-m \"not slow\"')", "local: marks test as local (not for CI)", @@ -113,29 +110,3 @@ ignore = ["E501", "E402"] [tool.ruff.lint] select = ["I", "E", "F"] - -[tool.tox] -legacy_tox_ini = """ -[tox] -envlist = py{311,312,313} -isolated_build = True - -[gh-actions] -python = - 3.11: py311 - 3.12: py312 - 3.13: py313 - -[testenv] -extras = - dev -commands = - pytest -v --color=yes --cov=brainrender --cov-report=xml -passenv = - CI - GITHUB_ACTIONS - DISPLAY - XAUTHORITY - NUMPY_EXPERIMENTAL_ARRAY_FUNCTION - PYVISTA_OFF_SCREEN -"""