Skip to content

Commit

Permalink
Changed version number to 0.8.0rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
apdavison committed Aug 19, 2015
1 parent 5762d36 commit 4b4a953
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 40 deletions.
6 changes: 6 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
================
Release 0.8.0rc1
================

see doc/releases/0.8.0-rc-1.txt

================
Release 0.8beta2
================
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class MockNESTModule(mock.Mock):
# The short X.Y version.
version = '0.8'
# The full version, including alpha/beta/rc tags.
release = '0.8beta2'
release = '0.8.0rc1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
47 changes: 20 additions & 27 deletions doc/installation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ If you are running Debian or Ubuntu, there are :doc:`binary packages <download>`
available. If you would prefer to install manually, :doc:`download the latest
source distribution <download>`, then run the setup script, e.g.::

$ tar xzf PyNN-0.8beta2.tar.gz
$ cd PyNN-0.8beta2
$ tar xzf PyNN-0.8.0rc1.tar.gz
$ cd PyNN-0.8.0rc1
$ python setup.py install

This will install it to your Python :file:`site-packages` directory, and may
Expand Down Expand Up @@ -64,52 +64,45 @@ The PyNN installation will then compile PyNN-specific membrane mechanisms, which
netstim2.mod refrac.mod reset.mod stdwa_guetig.mod stdwa_softlimits.mod stdwa_songabbott.mod
stdwa_symm.mod tmgsyn.mod tmisyn.mod tsodyksmarkram.mod vecstim.mod

If you installed PyNN before installing NEURON, or if you update your PyNN installation, you will need to manually run :command:`nrnivmodl` in the :file:`pyNN/neuron/nmodl` directory.
If you installed PyNN before installing NEURON, or if you update your PyNN installation,
you will need to manually run :command:`nrnivmodl` in the :file:`pyNN/neuron/nmodl` directory.

Installing NEURON
=================

Download the sources for the latest release of NEURON, in ``.tar.gz`` format, from `<http://www.neuron.yale.edu/neuron/download/getstd>`_. Also download Interviews from the same location.
Download the sources for the latest release of NEURON, in ``.tar.gz`` format, from `<http://www.neuron.yale.edu/neuron/download/getstd>`_.
Also download Interviews from the same location.

Compile Interviews and NEURON according to the instructions given at `<http://www.neuron.yale.edu/neuron/static/download/compilestd_unix.html>`_, except that when you run :command:`configure`, add the options :option:`--with-nrnpython` and, optionally, :option:`--with-paranrn`, i.e.::
Compile Interviews and NEURON according to the instructions given at `<http://www.neuron.yale.edu/neuron/static/download/compilestd_unix.html>`_,
except that when you run :command:`configure`, add the options :option:`--with-nrnpython` and, optionally, :option:`--with-paranrn`, i.e.::

$ ./configure --prefix=`pwd` --with-nrnpython --with-paranrn
$ make
$ make install

Make sure that you add the Interviews and NEURON :file:`bin` directories to your path. Test that the Python support has been enabled by running::
Make sure that you add the Interviews and NEURON :file:`bin` directories to your path.
Test that the Python support has been enabled by running::

$ nrniv -python
NEURON -- Release 7.1 (359:7f113b76a94b) 2009-10-26
Duke, Yale, and the BlueBrain Project -- Copyright 1984-2008
See http://www.neuron.yale.edu/credits.html
NEURON -- VERSION 7.3 ansi (1078:2b0c984183df) 2014-04-04
Duke, Yale, and the BlueBrain Project -- Copyright 1984-2014
See http://www.neuron.yale.edu/neuron/credits

>>> import hoc
>>> import nrn

Now you can compile and install NEURON as a Python package::

$ cd src/nrnpython
# python setup.py install

Note that the latter step requires running as root and will install to your global Python :file:`site-packages` directory.
If you would prefer to install it locally, replace the last step with::

$ python setup.py install --prefix=~

which will install into :file:`~/lib/python2.7/site-packages/` (or the equivalent for other Python versions; for more fine-grained control over where the package is installed, see the `distutils`_ documentation), then add this directory to your :envvar:`PYTHONPATH`::

$ export PYTHONPATH=$PYTHONPATH:~/lib/python2.7/site-packages
$ python setup.py install

Now test everything worked::

$ python
>>> import neuron
NEURON -- Release 7.1 (359:7f113b76a94b) 2009-10-26
Duke, Yale, and the BlueBrain Project -- Copyright 1984-2008
See http://www.neuron.yale.edu/credits.html

>>>
NEURON -- VERSION 7.3 ansi (1078:2b0c984183df) 2014-04-04
Duke, Yale, and the BlueBrain Project -- Copyright 1984-2014
See http://www.neuron.yale.edu/neuron/credits

If you run into problems, check out the `NEURON Forum`_.

Expand All @@ -131,9 +124,9 @@ On Linux, most Unix variants and Mac OS X, installation is usually as simple as:

$ ./configure --with-mpi
$ make
# make install
$ make install

This will install PyNEST to your Python :file:`site-packages` directory, and may require root privileges.
This will install PyNEST to your Python :file:`site-packages` directory.
If you wish to install it elsewhere, see the full installation instructions.

Now try it out::
Expand All @@ -157,7 +150,7 @@ Installing Brian
================

Instructions for downloading and installing Brian_ are available from `<http://briansimulator.org/download/>`_.

Note that this version of PyNN works with Brian 1.4, but not with Brian 2.


.. _PyNN: http://neuralensemble.org/PyNN
Expand Down
1 change: 1 addition & 0 deletions doc/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Release notes
.. toctree::
:maxdepth: 1

releases/0.8.0-rc-1.txt
releases/0.8-beta-2.txt
releases/0.8-beta-1.txt
releases/0.8-alpha-2.txt
Expand Down
2 changes: 1 addition & 1 deletion doc/releases/0.8-beta-2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ Other changes
.. _Brian: http://http://briansimulator.org
.. _NEST: http://www.nest-initiative.org/
.. _NEURON: http://www.neuron.yale.edu/neuron/
.. _`Assorted bug fixes`: https://github.com/NeuralEnsemble/PyNN/issues?q=is%3Aclosed+closed%3A%3E2013-11-15+milestone%3A0.8.0
.. _`Assorted bug fixes`: https://github.com/NeuralEnsemble/PyNN/issues?q=is%3Aclosed+closed%3A2013-11-15..2015-01-06+milestone%3A0.8.0
25 changes: 25 additions & 0 deletions doc/releases/0.8.0-rc-1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
============================================
PyNN 0.8.0 release candidate 1 release notes
============================================

August 19th 2015

Welcome to the first release candidate of PyNN 0.8.0!

For full information about what's new in PyNN 0.8, see the :doc:`0.8-alpha-1`, :doc:`0.8-beta-1` and :doc:`0.8-beta-2`

NEST 2.6
--------

The main new feature in this release is support for NEST_ 2.6. Previous versions of NEST are no longer supported.

Other changes
-------------

* Travis CI now runs system tests as well as unit tests.
* `Assorted bug fixes`_



.. _NEST: http://www.nest-initiative.org/
.. _`Assorted bug fixes`: https://github.com/NeuralEnsemble/PyNN/issues?q=is%3Aclosed+closed%3A2015-01-07..2015-08-19+milestone%3A0.8.0
2 changes: 1 addition & 1 deletion doc/testdocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def remove_data_files():
# Process command line
parser = OptionParser(usage="usage: %prog [options] FILE")
parser.add_option("-s", "--simulator", dest="simulator",
type="choice", choices=('nest', 'neuron', 'pcsim', 'brian'),
type="choice", choices=('nest', 'neuron', 'brian'),
help="run doctests with SIMULATOR", metavar="SIMULATOR",
default='nest')
parser.add_option("--strict", action="store_true", dest="strict", default=False,
Expand Down
2 changes: 1 addition & 1 deletion examples/VAbenchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
simulator benchmark
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
benchmark either CUBA or COBA
optional arguments:
Expand Down
2 changes: 1 addition & 1 deletion examples/current_injection.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Usage: current_injection.py [-h] [--plot-figure] simulator
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
optional arguments:
-h, --help show this help message and exit
Expand Down
2 changes: 1 addition & 1 deletion examples/random_numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Usage: random_numbers.py [-h] [--plot-figure] [--debug DEBUG] simulator
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
optional arguments:
-h, --help show this help message and exit
Expand Down
2 changes: 1 addition & 1 deletion examples/small_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Usage: random_numbers.py [-h] [--plot-figure] [--debug DEBUG] simulator
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
optional arguments:
-h, --help show this help message and exit
Expand Down
2 changes: 1 addition & 1 deletion examples/tsodyksmarkram.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Usage: tsodyksmarkram.py [-h] [--plot-figure] [--debug DEBUG] simulator
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
optional arguments:
-h, --help show this help message and exit
Expand Down
2 changes: 1 addition & 1 deletion examples/varying_poisson.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Usage: varying_poisson.py [-h] [--plot-figure] simulator
positional arguments:
simulator neuron, nest, brian, pcsim or another backend simulator
simulator neuron, nest, brian or another backend simulator
optional arguments:
-h, --help show this help message and exit
Expand Down
2 changes: 1 addition & 1 deletion pyNN/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
:license: CeCILL, see LICENSE for details.
"""

__version__ = '0.8dev'
__version__ = '0.8.0rc1'
__all__ = ["common", "random", "nest", "neuron", "brian",
"recording", "errors", "space", "descriptions",
"standardmodels", "parameters", "core"]
2 changes: 1 addition & 1 deletion pyNN/utility/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def get_simulator(*arguments):
import argparse
parser = argparse.ArgumentParser()
parser.add_argument("simulator",
help="neuron, nest, brian, pcsim or another backend simulator")
help="neuron, nest, brian or another backend simulator")
for argument in arguments:
arg_name, help_text = argument[:2]
extra_args = {}
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def find_nrnivmodl(self):

setup(
name = "PyNN",
version = "0.8dev",
packages = ['pyNN','pyNN.nest', 'pyNN.neuron', 'pyNN.nineml',
version = "0.8.0rc1",
packages = ['pyNN','pyNN.nest', 'pyNN.neuron',
'pyNN.brian', 'pyNN.common', 'pyNN.mock',
'pyNN.recording', 'pyNN.standardmodels', 'pyNN.descriptions',
'pyNN.nest.standardmodels',
Expand Down

0 comments on commit 4b4a953

Please sign in to comment.