Merge pull request #1346 from PrincetonUniversity/devel

Devel

.appveyor.yml

@@ -32,8 +32,7 @@ install:
   - pip install --user -U pip
   - pip --version
   # certifi upgrade is needed by pytest-profiling (it does not set the dependencies right)
-  # numpy 1.16 gets pulled by leabra below and pnl downgrades it to <1.16 later
-  - pip install --user -U certifi "numpy<1.16"
+  - pip install --user -U certifi
   - pip install --user git+https://github.com/benureau/leabra.git@master
 
   # pytorch does not distribute windows packages over pypi.

.travis.yml

@@ -77,17 +77,9 @@ before_install:
     fi
   - python --version
   - pip --version
-  - |
-    if [ "x$COVERALLS_REPO_TOKEN" != "x" ]; then
-          export PYTEST_COV="--cov=psyneulink"
-    else
-          export PYTEST_COV=""
-    fi
 
 install:
-  # Downgrade numpy early if needed.
-  - pip install -U 'numpy<1.16'
-  - if [ "x$COVERALLS_REPO_TOKEN" != "x" ]; then pip install coveralls; fi
+  - pip install coveralls
   - pip install git+https://github.com/benureau/leabra.git@master
   # Travis bundles pytest 4.3.1 in Linux Xenial, new pytest-xdist
   # requires pytest>=4.4.0, and the dependencies are broken
@@ -96,7 +88,10 @@ install:
 
 
 script:
-  - pytest -n auto --strict-markers -p no:logging $PYTEST_COV
+  - pytest -n auto --strict-markers -p no:logging --cov=psyneulink
 
 after_script:
-  - if [ "x$COVERALLS_REPO_TOKEN" != "x" ]; then coveralls; fi
+  - COVERALLS_PARALLEL=true coveralls
+
+notifications:
+  webhooks: https://coveralls.io/webhook

docs/source/BasicsAndSampler.rst

@@ -124,7 +124,7 @@ As the name of the ``show_graph()`` method suggests, Compositions are represente
 standard dependency dictionary format, so that they can also be submitted to other graph theoretic packages for
 display and/or analysis (such as `NetworkX <https://networkx.github.io>`_ and `igraph <http://igraph.org/redirect
 .html>`_).  They can also be exported as a JSON file, in a format that is currently being developed for the exchange
-of computational models in neuroscience and psychology (see `BIDS <XXX>`)
+of computational models in neuroscience and psychology (see `json`)
 
 .. XXX USE show_graph(show_node_structure=True) HERE OR ABOVE::