fix ci install (tests failing now as they locally)

Author: rmorshea

.travis.yml

@@ -15,7 +15,10 @@ addons:
 before_install:
 - sudo apt update
 # javascript dependencies
-- sudo apt install nodejs
+- curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash
+- nvm install 10.16.3
+- nvm use 10.16.3
+- npm --version
 # install chromebrowser
 - wget -N http://chromedriver.storage.googleapis.com/2.38/chromedriver_linux64.zip -P ~/
 - unzip ~/chromedriver_linux64.zip -d ~/
@@ -26,7 +29,9 @@ before_install:
 install:
 # Install IDOM along with test requirements
 - pip install -r requirements.txt
+- python setup.py build
 - pip install -e .[all]
+- ls src/idom/client
 
 script:
 - bash scripts/test.sh

MANIFEST.in

@@ -1,5 +1,6 @@
-graft src/idom/client/
-prune src/idom/client/node_modules
+graft src/idom/client/core_modules
+graft src/idom/client/web_modules
+include src/idom/client/index.html
 
 include src/idom/py.typed
 include LICENSE

requirements/dev.txt

@@ -2,3 +2,4 @@ jupyterlab
 pre-commit
 notebook
 twine
+wheel

requirements/extras.txt

@@ -1,4 +1,4 @@
-# extra=sanic
+# extra=stable,sanic
 sanic <19.12.0
 sanic-cors >=0.9.9, <1.0
 

requirements/test.txt

@@ -1,7 +1,6 @@
 pytest==5.2.2
 pytest-asyncio
 pytest-cov
-pytest-rerunfailures
 mypy>=0.750
 black
 flake8

scripts/build.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
+set -e
+
 cd src/idom/client
 rm -rf node_modules
 rm -rf web_modules
+rm -rf etc_modules
 npm install
 npm run snowpack
 cd ../../../

scripts/test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-pytest src/tests --headless --cov=idom --cov-fail-under=82 --reruns 1
+pytest src/tests --headless --cov=idom --cov-fail-under=82 -vv
 black --verbose --check src/py
 flake8 src/
 mypy src/idom

setup.py

@@ -50,18 +50,20 @@
             requirements.append(line)
 package["install_requires"] = requirements
 
-_current_extra_section = None
+_current_extras = []
 extra_requirements = {"all": []}  # type: ignore
 extra_requirements_path = os.path.join(here, "requirements", "extras.txt")
 with open(extra_requirements_path, "r") as f:
     for line in map(str.strip, f):
         if line.startswith("#") and line[1:].strip().startswith("extra="):
-            _current_extra_section = line.split("=", 1)[1]
-            if _current_extra_section == "all":
+            _current_extras = [e.strip() for e in line.split("=", 1)[1].split(",")]
+            if "all" in _current_extras:
                 raise ValueError("%r uses the reserved extra name 'all'")
-            extra_requirements[_current_extra_section] = []
-        elif _current_extra_section is not None:
-            extra_requirements[_current_extra_section].append(line)
+            for e in _current_extras:
+                extra_requirements[e] = []
+        elif _current_extras:
+            for e in _current_extras:
+                extra_requirements[e].append(line)
             extra_requirements["all"].append(line)
         elif line:
             msg = "No '# extra=<name>' header before requirements in %r"

src/docs/source/install.rst

@@ -40,7 +40,7 @@ In order to work with IDOM's source code you'll need to install:
 
 - git_
 
-- Yarn_
+- npm_
 
 You'll begin by copy the source from GitHub onto your computer using Git:
 
@@ -53,23 +53,23 @@ At this point you should be able to run this install command to:
 
 - Install an editable version of the Python code
 
-- Transpile the Javascript and copy it to ``src/py/idom/static``
+- Download, build, and install Javascript dependencies
 
 - Install some pre-commit hooks for Git
 
 .. code-block:: bash
 
     pip install -e . -r requirements.txt && pre-commit install
 
-If you modify a Javascript library you'll need to re-run this command:
+Since we're using native ES modules for our Javascript, you should usually be able to
+refresh your browser page to see your latest changes to the client. However if you
+modify any dependencies you can run standard ``npm`` commands to install them or
+simply run the following to re-evaluate the ``package.json``:
 
 .. code-block:: bash
 
     pip install -e .
 
-This will transpile the Javascript again and copy it to the
-``src/py/idom/static`` folder.
-
 
 Running The Test
 ----------------
@@ -97,13 +97,13 @@ run:
 
 .. code-block:: bash
 
-    pytest src/py/tests
+    pytest src/tests
 
 If you prefer to run the tests using a headless browser:
 
 .. code-block:: bash
 
-    pytest src/py/tests --headless
+    pytest src/tests --headless
 
 .. Links
 .. =====
@@ -112,8 +112,8 @@ If you prefer to run the tests using a headless browser:
 .. _ChromeDriver: https://chromedriver.chromium.org/downloads
 .. _git: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git
 .. _Git Bash: https://gitforwindows.org/
+.. _npm: https://www.npmjs.com/get-npm
 .. _PyPI: https://pypi.org/project/idom
 .. _pip: https://pypi.org/project/pip/
 .. _PyTest: pytest <https://docs.pytest.org
 .. _Selenium: https://www.seleniumhq.org/
-.. _Yarn: https://yarnpkg.com/lang/en/docs/install