fix tests

.github/workflows/test_and_deploy.yml

@@ -1,18 +1,15 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
 name: tests
 
-on: 
+on:
  push:
  branches:
  - main
- - main
+ - master
  tags:
  - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
  pull_request:
  branches:
- - main
+ - master
  - main
  workflow_dispatch:
 
@@ -22,25 +19,19 @@ jobs:
  runs-on: ${{ matrix.platform }}
  strategy:
  matrix:
- platform: [ubuntu-latest, windows-latest, macos-latest]
- python-version: [3.7, 3.8, 3.9]
+ platform: [windows-latest, macos-latest] # ubuntu-latest is failing anyway
+ python-version: ['3.8', '3.9', '3.10']
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
 
- # these libraries, along with pytest-xvfb (added in the `deps` in tox.ini),
- # enable testing on Qt on linux
- - name: Install Linux libraries
- if: runner.os == 'Linux'
- run: |
- sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \
- libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \
- libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0
+ # these libraries enable testing on Qt on linux
+ - uses: tlambert03/setup-qt-libs@v1
 
  # strategy borrowed from vispy for installing opengl libs on windows
  - name: Install Windows OpenGL
@@ -56,20 +47,22 @@ jobs:
  - name: Install dependencies
  run: |
  python -m pip install --upgrade pip
- pip install setuptools tox tox-gh-actions
+ python -m pip install setuptools tox tox-gh-actions pytest-qt
 
  # this runs the platform-specific tests declared in tox.ini
  - name: Test with tox
- run: tox
+ uses: GabrielBB/xvfb-action@v1
+ with:
+ run: python -m tox
  env:
  PLATFORM: ${{ matrix.platform }}
 
  - name: Coverage
- uses: codecov/codecov-action@v1
+ uses: codecov/codecov-action@v2
 
  deploy:
  # this will run when you have tagged a commit, starting with "v*"
- # and requires that you have put your twine API key in your 
+ # and requires that you have put your twine API key in your
  # github secrets (see readme for details)
  needs: [test]
  runs-on: ubuntu-latest
@@ -83,12 +76,12 @@ jobs:
  - name: Install dependencies
  run: |
  python -m pip install --upgrade pip
- pip install -U setuptools setuptools_scm wheel twine
+ pip install -U setuptools setuptools_scm wheel twine build
  - name: Build and publish
  env:
  TWINE_USERNAME: __token__
  TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}
  run: |
  git tag
- python setup.py sdist bdist_wheel
- twine upload dist/*
+ python -m build .
+ twine upload dist/*

setup.cfg

@@ -16,9 +16,9 @@ classifiers =
  Topic :: Scientific/Engineering :: Information Analysis
  Programming Language :: Python
  Programming Language :: Python :: 3
- Programming Language :: Python :: 3.7
  Programming Language :: Python :: 3.8
  Programming Language :: Python :: 3.9
+ Programming Language :: Python :: 3.10
  Operating System :: OS Independent
  License :: OSI Approved :: BSD License
 project_urls =

tox.ini

@@ -1,12 +1,12 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-envlist = py{37,38,39}-{linux,macos,windows}
+envlist = py{38,39,310}-{linux,macos,windows}
 
 [gh-actions]
 python =
- 3.7: py37
  3.8: py38
  3.9: py39
+ 3.10: py310
 
 [gh-actions:env]
 PLATFORM =