Skip to content

Commit 3be9ac2

Browse files
terhorstdterhorstd
authored
Merge pull request nest#1472 from steffengraber/doc-final-check
Final updates in documentation and the debian package for v2.20.1
2 parents d743255 + a2d159e commit 3be9ac2

File tree

10 files changed

+50
-39
lines changed

10 files changed

+50
-39
lines changed

‎debian/changelog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
nest (2.20.1-0ubuntu1ppa1) unstable; urgency=low
2+
3+
* NEST v2.20.1
4+
* Added boost to /debian files
5+
6+
-- Steffen Graber <[email protected]> Tue, 17 Mar 2020 07:00:00 +0000
7+
18
nest (2.18.0+1SNAPSHOT-0ubuntu1ppa1) unstable; urgency=low
29

310
* NEST daily builds of master in 'ppa:nest-simulator/nest-nightly'

‎debian/control

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: science
33
Priority: optional
44
Maintainer: Steffen Graber <[email protected]>
55
Build-Depends: cmake, debhelper (>= 9), autotools-dev,
6-
software-properties-common, build-essential, autoconf, python3,
6+
software-properties-common, build-essential, autoconf, python3, libboost-all-dev,
77
libltdl-dev, libreadline-dev, libncurses-dev, libgsl-dev, openmpi-bin,
88
python3-dev, libopenmpi-dev, libgomp1, libomp-dev, libibverbs-dev, libpcre3, libpcre3-dev, jq,
99
python3-numpy, python3-pandas, python3-scipy,python3-matplotlib, python3-mpi4py, python3-setuptools, python3-tk,
@@ -12,9 +12,9 @@ Standards-Version: 4.1.1
1212

1313
Package: nest
1414
Architecture: any
15-
Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libltdl-dev,
16-
libreadline-dev, libncurses-dev, libgsl-dev, openmpi-bin,
17-
python3-dev, libopenmpi-dev, libgomp1, libomp-dev, libibverbs-dev, libpcre3, libpcre3-dev, jq,
15+
Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libboost-all-dev, libltdl-dev,
16+
libreadline-dev, libncurses-dev, libgsl-dev,
17+
python3-dev, libgomp1, libomp-dev, libibverbs-dev, libpcre3, libpcre3-dev, jq,
1818
python3-numpy, python3-pandas, python3-scipy, python3-matplotlib, python3-mpi4py, python3-setuptools,
1919
python3-pydot, python3-tk, cython3
2020
Description: NEST is a simulator for networks of spiking neurons.

‎debian/copyright

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
Format: http://dep.debian.net/deps/dep5
22
Upstream-Name: nest-simulator
3-
Source: https://github.com/nest/nest-simulator/archive/master.zip
3+
Source: https://github.com/nest/nest-simulator/
44

5-
Files: debian/*
6-
Copyright: 2019 The NEST Initiative <[email protected]>
7-
License: GPL-2
5+
Files: *
6+
Copyright: 2004 The NEST Initiative
7+
License: GPL-2+
8+
9+
License: GPL-2+
810
NEST is free software: you can redistribute it and/or modify
911
it under the terms of the GNU General Public License as published by
1012
the Free Software Foundation, either version 2 of the License, or
1113
(at your option) any later version.
12-
.
14+
.
1315
NEST is distributed in the hope that it will be useful,
1416
but WITHOUT ANY WARRANTY; without even the implied warranty of
1517
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1618
GNU General Public License for more details.
17-
19+
.
1820
You should have received a copy of the GNU General Public License
1921
along with NEST. If not, see <http://www.gnu.org/licenses/>.

‎debian/rules

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ INSTALLDIR = \/$(BUILDDIR)\/$(PACKAGEVERSION)\/$(DESTDIR)
88

99
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=$(DESTDIR)/usr -Dwith-python=3 -DCMAKE_INSTALL_LIBDIR:PATH=lib
1010
CMAKE_FLAGS += -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc
11-
CMAKE_FLAGS += -Dwith-mpi=ON
11+
CMAKE_FLAGS += -Dwith-mpi=OFF
1212
CMAKE_FLAGS += -Dwith-openmp=ON
13-
CMAKE_FLAGS += -Dwith-gsl=ON -Dwith-ltdl=ON -Dwith-readline=ON
13+
CMAKE_FLAGS += -Dwith-gsl=ON -Dwith-ltdl=ON -Dwith-readline=ON -Dwith-boost=ON
1414

1515
%:
1616
LC_ALL=en_US.UTF-8 dh ${@} --with python3 --builddirectory=$(BUILDDIR)

‎doc/contribute/mailing_list_guidelines.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ please follow the guidelines below:
2121

2222
* the steps you took that lead to the problem.
2323
* the specific error messages you get.
24-
* relevant system and version information (e.g., Ubuntu 18.04/ NEST 2.20 installed using Conda).
24+
* relevant system and version information (e.g., Ubuntu 18.04/ NEST 2.20.1 installed using Conda).
2525

2626
#. Keep topics separate.
2727

‎doc/download.rst

+13-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you use NEST for your project, don't forget to :doc:`cite NEST <citing-nest>`
2121
Download NEST source code
2222
--------------------------
2323

24-
* Get the `source code of the latest release <https://github.com/nest/nest-simulator/archive/v2.20.0.tar.gz>`_.
24+
* Get the `source code of the latest release <https://github.com/nest/nest-simulator/archive/v2.20.1.tar.gz>`_.
2525

2626

2727
* Follow the installation instructions for :doc:`Linux <installation/linux_install>` or :ref:`macOS <mac_manual>`.
@@ -40,15 +40,13 @@ Live media is available in the OVA format, and is suitable, for example, for imp
4040
If you run **Windows**, this is the option for you OR if you just want to run NEST without installing it on your computer.
4141
After downloading the virtual machine, check out the :doc:`install instructions for Live Media <installation/livemedia>`.
4242

43-
* `NEST Live Media 2.18.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.18.0.ova>`_
44-
45-
`Checksum 2.18.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.18.0.ova.sha512sum>`_
43+
* `NEST Live Media 2.20.1 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.20.1.ova>`_
4644

45+
`Checksum 2.20.1 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.20.1.ova.sha512sum>`_
4746

48-
* `NEST live media 2.16.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.16.0.ova>`_
49-
50-
`Checksum 2.16.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.16.0.ova.sha512sum>`_
47+
* `NEST Live Media 2.20.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.20.0.ova>`_
5148

49+
`Checksum 2.20.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.20.0.ova.sha512sum>`_
5250

5351
Previous releases
5452
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,6 +56,14 @@ thus, we encourage our users to use the **most recent version of NEST**.
5856

5957
**Older Versions of Live Media**
6058

59+
- `NEST Live Media 2.18.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.18.0.ova>`_
60+
61+
`Checksum 2.18.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.18.0.ova.sha512sum>`_
62+
63+
- `NEST live media 2.16.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.16.0.ova>`_
64+
65+
`Checksum 2.16.0 <https://nest-simulator.org/downloads/gplreleases/lubuntu-18.04_nest-2.16.0.ova.sha512sum>`_
66+
6167
- `NEST Live Media 2.14.0 <https://www.nest-simulator.org/downloads/gplreleases/nest-live.ova>`_ (OVA, 2.5G)
6268

6369
`Checksum 2.14.0 <https://www.nest-simulator.org/downloads/gplreleases/lubuntu-16.04_nest-2.14.0.ova.sha512sum>`_

‎doc/installation/index.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ these instructions.**
241241

242242
.. tab:: macOS
243243

244-
For further options on installing NEST on macOS, see :ref:`mac_manual` for Macs.
244+
For further options on installing NEST on macOS, see :doc:`mac_install`.
245245

246246

247247
.. tab:: HPC systems
@@ -266,4 +266,3 @@ these instructions.**
266266
Installation instructions for NEST 2.10 and earlier are provided :doc:`here <oldvers_install>`, but we strongly encourage all our users to stay
267267
up-to-date with most recent version of NEST. We cannot support out-dated versions.
268268

269-

‎doc/tutorials/topology/hill_tononi_Vp.ipynb

+2-2
Large diffs are not rendered by default.

‎doc/tutorials/topology/hill_tononi_Vp.py

+11-14
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,17 @@
150150
"""
151151

152152
import pylab
153+
# ! Introduction
154+
# !=============
155+
# ! This tutorial gives a brief introduction to the ConnPlotter
156+
# ! toolbox. It is by no means complete.
157+
# ! Load pynest
158+
import nest
159+
# ! Load NEST Topoplogy module (NEST 2.20.1)
160+
import nest.topology as topo
161+
# ! Import math, we need Pi
162+
import math
163+
153164
SHOW_FIGURES = False
154165

155166
if not SHOW_FIGURES:
@@ -162,24 +173,10 @@ def nop(s=None):
162173
else:
163174
pylab.ion()
164175

165-
# ! Introduction
166-
# !=============
167-
# ! This tutorial gives a brief introduction to the ConnPlotter
168-
# ! toolbox. It is by no means complete.
169-
170-
# ! Load pynest
171-
import nest
172-
173-
# ! Load NEST Topoplogy module (NEST 2.2)
174-
import nest.topology as topo
175-
176176
# ! Make sure we start with a clean slate, even if we re-run the script
177177
# ! in the same Python session.
178178
nest.ResetKernel()
179179

180-
# ! Import math, we need Pi
181-
import math
182-
183180
# ! Configurable Parameters
184181
# ! =======================
185182
# !

‎doc/tutorials/topology/hill_tononi_Vp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ functions, see documentation.
151151
# ! Load pynest
152152
import nest
153153
154-
# ! Load NEST Topoplogy module (NEST 2.2)
154+
# ! Load NEST Topoplogy module (NEST 2.20.1)
155155
import nest.topology as topo
156156
157157
# ! Make sure we start with a clean slate, even if we re-run the script

0 commit comments

Comments
 (0)