Merge pull request #1 from NeuralEnsemble/master

Latest
NeuralEnsemble · Apr 15, 2019 · 085c81f · 085c81f
2 parents 04142a6 + aebb1f3
commit 085c81f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 NeuralEnsemble
+Copyright (c) 2015-2018 NeuralEnsemble
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Available images:
 
-- simulation: NEST 2.12, NEURON 7.4, and PyNN 0.9 and the scientific Python stack
+- simulation: NEST 2.14, NEURON 7.5, PyNN 0.9 and the scientific Python stack
   - For **Python 3** use the [master branch](https://github.com/NeuralEnsemble/neuralensemble-docker/tree/master/simulation)
   - For **Python 2** use the [python2 branch](https://github.com/NeuralEnsemble/neuralensemble-docker/tree/python2/simulation)
 - simulationx: like "simulation", but with support for X11 forwarding over SSH

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update; apt-get install -y automake libtool build-essential openmpi-
                        wget python3 libpython3-dev libncurses5-dev libreadline-dev libgsl0-dev cython3 \
                        python3-pip python3-numpy python3-scipy python3-matplotlib python3-jinja2 python3-mock \
                        ipython3 python3-httplib2 python3-docutils python3-yaml \
-                       subversion python3-venv python3-mpi4py python3-tables cmake
+                       subversion python3-venv python3-mpi4py python3-tables python3-h5py cmake
 
 RUN useradd -ms /bin/bash docker
 USER docker
@@ -26,5 +26,5 @@ ENV VENV=$HOME/env/neurosci
 RUN python3 -m venv $VENV && python3 -m venv --system-site-packages $VENV
 
 RUN $VENV/bin/pip3 install --upgrade pip
-RUN $VENV/bin/pip3 install parameters quantities neo django django-tagging future hgapi gitpython sumatra
+RUN $VENV/bin/pip3 install parameters quantities neo "django<1.9" django-tagging future hgapi gitpython sumatra nixio
 RUN $VENV/bin/pip3 install --upgrade nose ipython
diff --git a/simulation/Dockerfile b/simulation/Dockerfile
@@ -5,7 +5,7 @@
 FROM neuralensemble/base
 MAINTAINER [email protected]
 
-ENV NEST_VER=2.12.0 NRN_VER=7.4
+ENV NEST_VER=2.14.0 NRN_VER=7.4
 ENV NEST=nest-$NEST_VER NRN=nrn-$NRN_VER
 ENV PATH=$PATH:$VENV/bin
 RUN ln -s /usr/bin/2to3-3.4 $VENV/bin/2to3

diff --git a/simulation/README.md b/simulation/README.md
@@ -2,7 +2,7 @@
 
 ## What it gives you
 
-* shell environment with NEST 2.12, NEURON 7.4, and PyNN 0.9 installed.
+* shell environment with NEST 2.14, NEURON 7.5, and PyNN 0.9 installed.
 * The Python 2.7 version provides Brian 1.4, the Python 3.4 version provides Brian 2.
 * IPython, scipy, matplotlib and OpenMPI are also installed.
 * use directly or as a base for your own project-specific Docker images.

diff --git a/simulationx/README.md b/simulationx/README.md
@@ -3,7 +3,7 @@
 
 ## What it gives you
 
-* shell environment with NEST 2.12, NEURON 7.4, and PyNN 0.9 installed.
+* shell environment with NEST 2.14, NEURON 7.5, and PyNN 0.9 installed.
 * The Python 2.7 version provides Brian 1.4, the Python 3.4 version provides Brian 2.
 * IPython, scipy, matplotlib and OpenMPI are also installed.
 * ssh access, so you can access the container with multiple terminals.