Skip to content

Commit

Permalink
Merge pull request #1 from timothycrosley/master
Browse files Browse the repository at this point in the history
Update to master
  • Loading branch information
xorbital committed Dec 3, 2019
2 parents b1c5626 + 90430ac commit 5a151e9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@ matrix:
- os: linux
python: 3.7
env: DEPLOY=yes
- os: linux
python: 3.8
- os: osx
language: generic
addons:
apt:
packages:
- libhidapi-hidraw0
- libudev-dev
- libusb-1.0-0-dev
- libegl1-mesa
- libx11-xcb1
services:
- xvfb
script:
- bash scripts/test.sh > /dev/null
- bash scripts/test.sh
after_script:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion docs/contributing/4.-acknowledgements.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Contributors
-

## Documenters
-
- @xorbital


--------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jupyter = "^1.0"
ipdb = "^0.12.2"
hypothesis-auto = "^1.1"
cruft = "^1.1"
numpy = "^1.16.2"

[tool.poetry.scripts]
streamdeck = "streamdeck_ui.gui:start"
Expand Down
6 changes: 6 additions & 0 deletions tests/test_gui.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import sys
from unittest.mock import MagicMock

import pytest
from hypothesis_auto import auto_pytest_magic

from streamdeck_ui import api, gui

pytestmark = pytest.mark.skipif(
sys.platform == "linux", reason="tests for mac only due to travis issues"
)

gui.selected_button = MagicMock()

auto_pytest_magic(gui.update_button_text, ui=MagicMock())
Expand Down

0 comments on commit 5a151e9

Please sign in to comment.