Merge master before removing old pre-syn branch.

neurokernel · Nov 24, 2015 · bdc6e5b · bdc6e5b
2 parents af1b8bd + 2efdfa2
commit bdc6e5b
Show file tree

Hide file tree

Showing 110 changed files with 2,500 additions and 16,557 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,14 @@
-include ez_setup.py
 include *.rst
-recursive-include docs *
+
+recursive-include neurokernel *.py
+recursive-include tests *.py
+recursive-include examples *.py
+recursive-include examples/vision *.csv
+
+include docs/source/*.rst
+include docs/Makefile
+include docs/source/conf.py
+include docs/source/_static/*
+include docs/source/_templates/*.html
+
 exclude MANIFEST.in
diff --git a/docs/source/reference_emulation.rst b/docs/source/reference_emulation.rst
@@ -9,8 +9,6 @@ Construction and Execution
    :toctree: generated/
    :nosignatures:
 
-   neurokernel.base.Manager
-   neurokernel.base_gpu.Manager
    neurokernel.core.Manager
    neurokernel.core_gpu.Manager
 

diff --git a/examples/lamina/data/gen_vis_input.py b/examples/lamina/data/gen_vis_input.py
diff --git a/examples/lamina/data/generate_lamina_gexf.py b/examples/lamina/data/generate_lamina_gexf.py
diff --git a/examples/lamina/data/neuron_types_lamina.csv b/examples/lamina/data/neuron_types_lamina.csv
diff --git a/examples/lamina/data/synapse_lamina.csv b/examples/lamina/data/synapse_lamina.csv