Skip to content

Commit

Permalink
Update CI to tox 4
Browse files Browse the repository at this point in the history
tox-gh-actions now supports tox 4.

Also fix `passenv` error with whitespace.
  • Loading branch information
elParaguayo committed Jul 31, 2023
1 parent 9b1c8d1 commit eec0bb8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ jobs:
dbus-x11 libnotify-bin \
xwayland libxcb-composite0-dev libxcb-icccm4-dev libxcb-res0-dev \
libxcb-render0-dev libxcb-res0-dev libxcb-xfixes0-dev vlc volumeicon-alsa
sudo pip -q install meson PyGObject
pip -q install "tox<4" tox-gh-actions
sudo pip -q install meson PyGObject tox tox-gh-actions
- name: Build wayland
run: |
wget -q --no-check-certificate https://wayland.freedesktop.org/releases/wayland-$WAYLAND.tar.xz
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tox]
skip_missing_interpreters = True
skipsdist=True
minversion = 1.8
minversion = 4.0.12
allowlist_externals={toxinidir}/scripts/ffibuild
envlist =
pypy3,
py39,
Expand All @@ -20,7 +21,7 @@ envlist =
# that our tests use.
setenv = LC_CTYPE = en_US.UTF-8
# Pass Display down to have it for the tests available
passenv = DISPLAY WAYLAND_DISPLAY
passenv = DISPLAY,WAYLAND_DISPLAY
whitelist_externals=convert
# xcffib has to be installed before cairocffi
deps =
Expand Down

0 comments on commit eec0bb8

Please sign in to comment.