Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to transitions 0.9.1 #39

Merged
merged 26 commits into from
May 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update pytest s
  • Loading branch information
aleneum committed May 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8abca356fcee0175887a78b25f009eb946cf4604
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -13,11 +13,13 @@ include frontend/README.md

include transitions_gui/static/js/main.js
include transitions_gui/static/js/main.js.map
include transitions_gui/static/thirdpartynotice.txt

recursive-include doc/img *.png
recursive-include examples *.py
recursive-include frontend/src *.js
recursive-include tests *.py
recursive-include transitions_gui *.pyi
recursive-include transitions_gui/static/css *.css
recursive-include transitions_gui/static/img *.svg
recursive-include transitions_gui/templates *.html
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
filterwarnings =
error
ignore:.*With-statements.*:DeprecationWarning
addopts = -x -rf
addopts = -rf
junit_family = xunit2
4 changes: 3 additions & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
nose
pytest
pytest-cov
pytest-runner
pycodestyle
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[metadata]
description-file = README.md
description_file = README.md

[check-manifest]
ignore =
.travis.yml
.scrutinizer.yml
appveyor.yml

[bdist_wheel]
universal = 1
8 changes: 5 additions & 3 deletions tests/test_web.py
Original file line number Diff line number Diff line change
@@ -10,11 +10,13 @@
class TestWebMachine(TestCase):

def tearDown(self):
assert self.machine._thread is not None
self.machine.stop_server()
time.sleep(0.1)

def test_server(self):
self.machine = WebMachine(**_SIMPLE_ARGS)
time.sleep(1)
time.sleep(0.5)

def test_threaded_server(self):

@@ -25,12 +27,12 @@ def run(self):

mf = MachineFactory()
mf.start()
time.sleep(1)
time.sleep(0.5)
self.machine = mf.machine

def test_trigger_event(self):
self.machine = WebMachine(**_SIMPLE_ARGS)
time.sleep(1)
time.sleep(0.5)
self.assertEqual('A', self.machine.state)
self.machine.process_message(dict(method='trigger', arg='next_state'))
self.assertEqual('B', self.machine.state)
2 changes: 1 addition & 1 deletion transitions_gui/static/thirdpartynotice.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016-2020, The Cytoscape Consortium.
Copyright (c) 2016-2024, The Cytoscape Consortium.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the “Software”), to deal in