Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions murakami/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
from datetime import datetime
import logging

from webthing import Thing

from murakami.errors import RunnerError
import murakami.utils as utils

Expand Down
5 changes: 3 additions & 2 deletions murakami/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
from apscheduler.triggers.base import BaseTrigger
from tornado.ioloop import IOLoop
from tornado import gen
from webthing import WebThingServer, SingleThing

import murakami.defaults as defaults
from murakami.thing import MurakamiThing
import murakami.utils as utils

_logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -140,6 +138,9 @@ def _load_runners(self):

# Start webthings server if enabled
if self._webthings:
from webthing import WebThingServer, SingleThing
from murakami.thing import MurakamiThing

self._server = WebThingServer(
SingleThing(MurakamiThing(self._runners.values())),
port=self._port,
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ murakami = 'murakami.__main__:main'
murakami-convert = 'scripts.convert:main'
murakami-upload = 'scripts.upload:main'

[tool.poetry.extras]
webthings = ["webthing"]

[tool.poetry.dependencies]
python = "^3.6"
webthing = "^0.12.0"
webthing = {version = "^0.12.0", optional = true}
configargparse = "^0.14.0"
tomlkit = "^0.5.5"
apscheduler = "^3.6"
Expand Down