Merge pull request #12 from Axelrod-Python/add-tests

Add tests

Author: marcharper

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+python:
+  - 3.5
+  - 3.6
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+install:
+  - pip install -r requirements.txt
+script:
+  - python nbtests.py

Cooperation vs score.ipynb

@@ -188,8 +188,9 @@
   }
  ],
  "metadata": {
+  "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python [default]",
    "language": "python",
    "name": "python3"
   },
@@ -203,7 +204,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.3"
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,

Moran Process.ipynb renamed to Moran-Process.ipynb

@@ -1,8 +1,15 @@
-A repository of Jupyter notebooks using the Axelrod project. Download, modify, and contribute your own notebooks!
+A repository of Jupyter notebooks using the Axelrod project.
+Download, modify, and contribute your own notebooks!
 
 Currently we have notebooks for the following:
 
 * [Basic Example Tournaments](basic-tournament.ipynb)
 * [Noisy Tournaments](basic-noisy-tournament.ipynb)
 * [Using Axelrod matches](Matches.ipynb)
-* [The Moran Process](Moran Process.ipynb)
+* [The Moran Process](Moran-Process.ipynb)
+* [Spatial tournaments on a lattice](Spatia-Lattice-Structured-Example.ipynb)
+* [Spatial tournaments on a cycle](Spatia-Circle-Structured-Example.ipynb)
+* [Code to recreate the Axelrod logo](Logo.ipynb)
+
+The `./untested/` dir contains notebooks that are not tested by the
+`./nbtests.py` script.

README.md

@@ -57,7 +57,7 @@
    "cell_type": "code",
    "execution_count": 15,
    "metadata": {
-    "collapsed": false
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -68,7 +68,6 @@
    "cell_type": "code",
    "execution_count": 16,
    "metadata": {
-    "collapsed": false,
     "scrolled": true
    },
    "outputs": [
@@ -105,9 +104,7 @@
   {
    "cell_type": "code",
    "execution_count": 17,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stderr",
@@ -117,16 +114,14 @@
    ],
    "source": [
     "edges = G.edges()\n",
-    "tournament = axl.SpatialTournament(players, edges=G.edges(), repetitions=1)\n",
+    "tournament = axl.Tournament(players, edges=G.edges(), repetitions=1)\n",
     "results = tournament.play(processes=1)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 18,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -155,9 +150,7 @@
   {
    "cell_type": "code",
    "execution_count": 19,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -177,8 +170,9 @@
   }
  ],
  "metadata": {
+  "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python [default]",
    "language": "python",
    "name": "python3"
   },
@@ -192,9 +186,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.1+"
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }

Spatia-Circle-Structured-Example.ipynb

@@ -0,0 +1,35 @@
+"""
+Script to test all notebooks execute without errors
+"""
+import nbformat
+import pathlib
+from nbconvert.preprocessors import ExecutePreprocessor
+
+def retrieve_errors(nb_path):
+    """
+    Find all errors that occur when running a nb
+    """
+
+    with nb_path.open() as f:
+        nb = nbformat.read(f, as_version=4)
+
+    ep = ExecutePreprocessor(timeout=600, kernel_name='python3',
+                             allow_errors=True)
+    out, _ = ep.preprocess(nb, {'metadata': {'path': '.'}})
+    errors = []
+    for cell in out.cells:
+        if "outputs" in cell:
+            for output in cell["outputs"]:
+                if output.output_type == "error":
+                    errors.append(output.evalue)
+    return errors
+
+if __name__ == "__main__":
+
+    nb_dir = pathlib.Path('.')
+    nbs = nb_dir.glob("*.ipynb")
+
+    for path in nbs:
+        print("Testing: {}".format(path.stem))
+        errors = retrieve_errors(path)
+        assert errors == [], errors

Spatia-Lattice-Structured-Example.ipynb

@@ -0,0 +1,6 @@
+axelrod
+networkx
+jupyter
+pillow
+pandas
+seaborn