switch to tox for more granular test parametrization

Author: rmorshea

.gitignore

@@ -16,9 +16,11 @@ venv
 MANIFEST
 build
 dist
+.eggs
 *.egg-info
 __pycache__/
 *.py[cod]
+.tox
 
 # --- PyEnv ---
 .python-version

.travis.yml

@@ -6,7 +6,6 @@ python:
   - 3.6
   - 3.7
   - 3.8
-  - 3.8-dev
 
 cache: apt
 
@@ -27,12 +26,10 @@ before_install:
   - sudo chmod +x /usr/bin/chromedriver
 
 install:
-  - pip install -r requirements.txt
-  - python setup.py build
-  - pip install .[all]
+  - pip install -r requirements/ci.txt
 
 script:
-  - bash scripts/test.sh
+  - tox
 
 after_success:
   - codecov

MANIFEST.in

@@ -2,3 +2,7 @@ graft idom/client/static/
 prune idom/client/static/node_modules
 include idom/py.typed
 include LICENSE
+include requirements/prod.txt
+include requirements/extras.txt
+include README.md
+include scripts/build.sh

docs/source/core-concepts.rst

@@ -134,11 +134,9 @@ ever be removed from the model. Then you'll just need to call and await a
 
         return idom.html.button({"onClick": increment}, [f"Click count: {count}"])
 
-
     click_count = ClickCount(0)
-    layout = idom.Layout(click_count)
-    update = await layout.render()
-
+    async with idom.Layout(click_count) as layout:
+        update = await layout.render()
 
     assert update.src == click_count.id
     assert update.new == {
@@ -174,13 +172,17 @@ method. Then we just have to re-render the layout and see what changed:
 
     from idom.core.layout import LayoutEvent
 
-    event_handler_id = update.new[click_count.id]["eventHandlers"]["onClick"]["target"]
-    dummy_event = LayoutEvent(event_handler_id, [{}])
+    click_count = ClickCount(0)
+    async with idom.Layout(click_count) as layout:
+        first_udpate = await layout.render()  # same as above
+
+        event_handler_id = first_udpate.new[click_count.id]["eventHandlers"]["onClick"]["target"]
+        dummy_event = LayoutEvent(event_handler_id, [{}])
 
-    await layout.trigger(dummy_event)
+        await layout.trigger(dummy_event)
+        second_update = await layout.render()
 
-    new_update = await layout.render()
-    assert new_update.new[click_count.id]["children"][0]["data"] == "Click count: 1"
+    assert second_update.new[click_count.id]["children"][0]["data"] == "Click count: 1"
 
 
 Layout Renderer
@@ -201,7 +203,6 @@ callback that's called by the renderer to events it should execute.
     from idom.core import SingleStateRenderer, EventHandler
     from idom.core.layout import LayoutEvent
 
-    layout = idom.Layout(ClickCount(0))
     sent_updates = []
 
 
@@ -224,11 +225,9 @@ callback that's called by the renderer to events it should execute.
         return event
 
 
-    renderer = SingleStateRenderer(layout)
-
-    context = None  # see note below
-
-    await renderer.run(send, recv, context)
+    async with SingleStateRenderer(idom.Layout(ClickCount(0))) as renderer:
+        context = None  # see note below
+        await renderer.run(send, recv, context)
 
     assert len(sent_updates) == 5
 

idom/__init__.py

@@ -22,7 +22,7 @@
     __version__ = _get_distribution(__name__).version
 except _DistributionNotFound:  # pragma: no cover
     # package is not installed
-    pass
+    __version__ = "0.0.0"
 
 # try to automatically setup the dialect's import hook
 try:

idom/core/utils.py

@@ -16,10 +16,7 @@
 )
 
 if sys.version_info >= (3, 7):  # pragma: no cover
-    from contextlib import (
-        asynccontextmanager,
-        AsyncExitStack,
-    )  # noqa
+    from contextlib import asynccontextmanager, AsyncExitStack  # noqa
 else:  # pragma: no cover
     from async_generator import asynccontextmanager
     from async_exit_stack import AsyncExitStack

requirements.txt

@@ -1,5 +1,4 @@
 -r requirements/prod.txt
 -r requirements/dev.txt
 -r requirements/docs.txt
--r requirements/test.txt
 -r requirements/extras.txt

requirements/ci.txt

@@ -0,0 +1,3 @@
+-r tox.txt
+tox-travis
+codecov

requirements/dev.txt

@@ -4,3 +4,4 @@ notebook
 twine
 wheel
 setuptools_scm
+-r tox.txt

requirements/lint.txt

@@ -0,0 +1,3 @@
+black
+flake8
+pep8-naming

requirements/mypy.txt

@@ -0,0 +1 @@
+mypy

requirements/test.txt

@@ -1,11 +1,7 @@
-pytest>=5.4.0
+pytest
 pytest-asyncio
 pytest-cov
 pytest-mock
-mypy>=0.750
-black
-flake8
-pep8-naming
-selenium
 flask
-codecov
+selenium
+ipython

requirements/tox.txt

@@ -0,0 +1,2 @@
+tox
+tox-wheel

setup.cfg

@@ -12,6 +12,8 @@ select = B,C,E,F,W,T4,B9,N
 exclude =
     idom/client/static/node_modules/*
     docs/source/widgets/*
+    .eggs/*
+    .tox/*
 
 [tool:pytest]
 testpaths = tests

tox.ini

@@ -0,0 +1,41 @@
+
+[tox]
+envlist = {py36,py37}-test, py38-{test,mypy,lint,docs,cov}
+
+[travis]
+python =
+  3.6: py36-test
+  3.7: py37-test
+  3.8: py38-{test,mypy,lint,docs,cov}
+
+[testenv]
+wheel = true
+extras = all
+usedevelop =
+    test: false
+    cov: true
+deps =
+    test: -r requirements/test.txt
+    cov: -r requirements/test.txt
+commands =
+    test: pytest tests --no-cov --headless
+    cov: pytest tests --headless
+
+[testenv:py38-mypy]
+skip_install = false
+extras = all
+deps = mypy
+commands = mypy --strict idom
+
+[testenv:py38-lint]
+skip_install = true
+deps = -r requirements/lint.txt
+commands =
+    black . --check --exclude "idom/client/static/node_modules/.*"
+    flake8 idom tests docs
+
+[testenv:py38-docs]
+deps = -r requirements/docs.txt
+commands =
+    sphinx-build -b html docs/source docs/build
+    sphinx-build -b doctest docs/source docs/build