diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 0c93444..27ca66e 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -99,7 +99,7 @@ jobs: python -m pip install setuptools tox tox-gh-actions - name: Test with tox - uses: GabrielBB/xvfb-action@v1 + uses: aganders3/headless-gui@v1.2 timeout-minutes: 3 with: run: python -m tox @@ -116,7 +116,7 @@ jobs: - name: Screenshots (Linux) if: runner.os == 'Linux' && matrix.screenshot - uses: GabrielBB/xvfb-action@v1 + uses: aganders3/headless-gui@v1.2 with: run: python examples/demo_widget.py -snap @@ -147,7 +147,7 @@ jobs: python -m pip install qtpy==1.1.0 typing-extensions==3.10.0.0 - name: Test - uses: GabrielBB/xvfb-action@v1 + uses: aganders3/headless-gui@v1.2 with: run: python -m pytest --color=yes @@ -178,7 +178,7 @@ jobs: python -m pip install ./napari-repo[testing,pyqt5] - name: Test napari - uses: GabrielBB/xvfb-action@v1 + uses: aganders3/headless-gui@v1.2 with: working-directory: napari-repo run: python -m pytest --color=yes napari/_qt diff --git a/pyproject.toml b/pyproject.toml index 7de6988..25fecc4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,30 +52,24 @@ test = ["pint", "pytest", "pytest-cov", "pytest-qt", "tox", "tox-conda"] dev = [ "black", "ipython", - "isort", - "jedi<0.18.0", + "ruff", "mypy", "pdbpp", "pre-commit", "pydocstyle", - "pyside2", - "pytest-cov", - "pytest-qt", - "pytest", "rich", - "tox-conda", - "tox", "types-Pygments", ] docs = ["mkdocs-macros-plugin", "mkdocs-material", "mkdocstrings[python]"] quantity = ["pint"] pyside2 = ["pyside2"] -pyside6 = ["pyside6"] +pyside6 = ["pyside6<6.5"] pyqt5 = ["pyqt5"] pyqt6 = ["pyqt6"] font-fa5 = ["fonticon-fontawesome5"] font-fa6 = ["fonticon-fontawesome6"] -font-mi5 = ["fonticon-materialdesignicons5"] +font-mi6 = ["fonticon-materialdesignicons6"] +font-mi7 = ["fonticon-materialdesignicons7"] [project.urls] Source = "https://github.com/pyapp-kit/superqt" @@ -97,7 +91,7 @@ src_paths = ["src/superqt", "tests"] [tool.ruff] line-length = 88 target-version = "py37" -src = ["src","tests"] +src = ["src", "tests"] select = [ "E", # style errors "F", # flakes @@ -184,5 +178,5 @@ ignore = [ "CONTRIBUTING.md", "codecov.yml", ".ruff_cache/**/*", - "setup.py" + "setup.py", ]