Merge pull request #883 from PrincetonUniversity/devel

v0.4.8.0

.travis.yml

@@ -1,10 +1,110 @@
 language: python
+
 python:
     - 3.5
     - 3.6
+
 install:
-  pip install -e .[dev]
+  - pip install coveralls
+  - pip install git+https://github.com/benureau/leabra.git@master
+  - pip install -e .[dev]
+
 os:
   - linux
+
+# Cache installed python packages
+cache:
+  directories:
+    - $HOME/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages
+    - $HOME/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin
+
+matrix:
+  include:
+  - python: 3.7
+    dist: xenial # Python 3.7 is only available on xenial because of deps
+
+  - os: osx
+    python: 3.5
+    language: generic
+    env:
+        - PYTHON=3.5.4
+        - PYTHON_PKG_VERSION=macosx10.6
+    # Cache installed python packages
+    cache:
+        directories:
+          - venv/lib/python3.5/site-packages
+          - venv/bin
+    # The pip update script below overwrites (and thus modifies) cached entries.
+    # Remove them to avoid reuploading the cache on every build
+    before_cache:
+        - rm -rvf venv/lib/python3.5/site-packages/pip*
+        - rm -rvf venv/bin/pip*
+
+  - os: osx
+    python: 3.6
+    language: generic
+    env:
+        - PYTHON=3.6.6
+        - PYTHON_PKG_VERSION=macosx10.9
+    # Cache installed python packages
+    cache:
+        directories:
+          - venv/lib/python3.6/site-packages
+          - venv/bin
+    # The pip update script below overwrites (and thus modifies) cached entries.
+    # Remove them to avoid reuploading the cache on every build
+    before_cache:
+        - rm -rvf venv/lib/python3.6/site-packages/pip*
+        - rm -rvf venv/bin/pip*
+
+  - os: osx
+    python: 3.7
+    language: generic
+    env:
+        - PYTHON=3.7.0
+        - PYTHON_PKG_VERSION=macosx10.9
+    # Cache installed python packages
+    cache:
+        directories:
+          - venv/lib/python3.7/site-packages
+          - venv/bin
+    # The pip update script below overwrites (and thus modifies) cached entries.
+    # Remove them to avoid reuploading the cache on every build
+    before_cache:
+        - rm -rvf venv/lib/python3.7/site-packages/pip*
+        - rm -rvf venv/bin/pip*
+
+addons:
+  apt:
+    packages:
+      - graphviz
+
+before_install: |
+  if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    FILE=python-$PYTHON-$PYTHON_PKG_VERSION.pkg
+    curl -O -#  https://www.python.org/ftp/python/$PYTHON/$FILE
+    sudo installer -pkg $FILE -target /
+    python3 --version
+    # This sidesteps TLSv1.1 issue when using pip
+    curl https://bootstrap.pypa.io/get-pip.py | python3
+    python3 -m pip  install virtualenv
+    python3 -m venv venv
+    source venv/bin/activate
+    python --version
+    # virtualenv installs default pip even if we updated it above.
+    # update it again.
+    curl https://bootstrap.pypa.io/get-pip.py | python
+
+    # setuptools also face the same TLS deprecation issue.
+    # Update them explicitly
+    python -m pip install -U setuptools
+    python -m pip install -U setuptools-git
+
+    HOMEBREW_NO_AUTO_UPDATE=1 brew install graphviz
+  fi
+
 script:
-  - python -m pytest -p no:logging tests/
+  - python -m pytest -p no:logging --cov=psyneulink tests/
+
+after_script:
+  - coveralls

README.rst

@@ -1,5 +1,7 @@
 .. image:: https://badge.fury.io/py/psyneulink.svg
     :target: https://badge.fury.io/py/psyneulink
+.. image:: https://travis-ci.org/PrincetonUniversity/PsyNeuLink.svg?branch=master
+    :target: https://travis-ci.org/PrincetonUniversity/PsyNeuLink
 .. image:: https://mybinder.org/badge.svg
     :target: https://mybinder.org/v2/gh/PrincetonUniversity/PsyNeuLink/master
 
@@ -56,10 +58,11 @@ PsyNeuLink is:
 
  - *extensible* -- it has an interface (API) that allows it to be used with other powerful tools for implementing
    individual components, such as:
-   * Neuron (biophysically realistic models of neuronal function)
-   * TensorFlow (ODE's, deep learning);
-   * Emergent (broad class of neurally-plausible connectionist models);
-   * ACT-R (symbolic, production system models).
+
+    * Neuron (biophysically realistic models of neuronal function)
+    * TensorFlow (ODE's, deep learning);
+    * Emergent (broad class of neurally-plausible connectionist models);
+    * ACT-R (symbolic, production system models).
 
 What PsyNeuLink is **NOT**
 --------------------------

Scripts/Aida.py

@@ -7,7 +7,6 @@
 import psyneulink as pnl
 import numpy as np
 
-
 # In[2]:
 
 
@@ -134,4 +133,3 @@ def statistical():
     minus_x, minus_y, plus_x, plus_y = statistical()
     TSP.run(inputs={ECin:minus_x}, targets={ECout:minus_y})
     ## Running the above line of code causes weights to get too large
-