Merge pull request #320 from genn-team/4_2_1_release_final

4.2.1 release notes etc

doxygen/00_MainPage.dox

@@ -18,7 +18,7 @@ GeNN is a software package to enable neuronal network simulations on
 NVIDIA GPUs by code generation. Models are defined in a simple C-style
 API and the code for running them on either GPU or CPU hardware is
 generated by GeNN. GeNN can also be used through external
-interfaces. Currently there are interfaces for \ref SpineML and for [Brian](http://brian2.readthedocs.io) via \ref brian2genn "Brian2GeNN".
+interfaces. Currently there are interfaces for \ref SpineML, a \ref PyGeNN and a [Brian](http://brian2.readthedocs.io) interface via \ref brian2genn "Brian2GeNN".
 
 GeNN is currently developed and maintained by
 

doxygen/06_Brian2GeNN.dox

@@ -1,9 +1,8 @@
 //----------------------------------------------------------------------------
 /*! \page brian2genn Brian interface (Brian2GeNN)
 
-GeNN can simulate models written for the [Brian simulator](http://brian2.readthedocs.io) via the [Brian2GeNN](http://brian2genn.readthedocs.io) interface \cite  brian2genn2018 .
-The easiest way to install everything needed is to install the [Anaconda](https://www.anaconda.com/download) or [Miniconda](https://conda.io/miniconda.html) Python distribution and then follow the [instructions to install Brian2GeNN](http://brian2genn.readthedocs.io/en/latest/introduction/index.html#installing-the-brian2genn-interface) with the conda package manager.
-When Brian2GeNN is installed in this way, it comes with a bundled version of GeNN and no further configuration is required. In all other cases (e.g. an installation from source), the path to GeNN and the CUDA libraries has to be configured via the `GENN_PATH` and `CUDA_PATH` environment variables as described in \ref Installation or via the `devices.genn.path` and `devices.genn.cuda_path` [Brian preferences](http://brian2.readthedocs.io/en/stable/advanced/preferences.html).
+GeNN can simulate models written for the [Brian simulator](http://brian2.readthedocs.io) via the [Brian2GeNN](http://brian2genn.readthedocs.io) interface \cite  brian2genn2018.
+In order for Brian2GeNN to find GeNN, GeNN must either be in your path with the location of the CUDA libraries configured via the `CUDA_PATH` environment variable (as described in \ref Installation) or the `devices.genn.path` and `devices.genn.cuda_backend.cuda_path` [Brian preferences](http://brian2.readthedocs.io/en/stable/advanced/preferences.html) should be set.
 
 To use GeNN to simulate a Brian script, import the `brian2genn` package and switch Brian to the `genn` device.
 As an example, the following Python script will simulate Leaky-integrate-and-fire neurons with varying input currents to construct an f/I curve:

doxygen/09_ReleaseNotes.dox

@@ -1,4 +1,18 @@
 /*! \page ReleaseNotes Release Notes
+Release Notes for GeNN v4.2.1 (PyGeNN 0.3.1)
+====
+This release fixes several small issues including several relating to Brian2GeNN compatibility.
+
+User Side Changes
+----
+1. Added -s option to genn-buildmodel.bat on Windows to turn off Visual C++ additional security checks (SDL), allowing Brian2GeNN libraries to be included in code generator.
+
+Bug fixes:
+----
+1. Fixed bug where \$(sT_pre) and \$(sT_post) were incorrect when accessed in weight update model pre and postsynaptic spike code respectively when using the single-threaded CPU backend.
+2. Fixed a corner case where valid models might result in compiler errors about ``Isyn`` not being defined.
+3. Fixed a bug preventing multiple include paths being passed to genn-buildmodel.bat on Windows.
+
 Release Notes for GeNN v4.2.0 (PyGeNN 0.3)
 ====
 This release adds a number of new features to GeNN and its Python interface as well as fixing a number of bugs that have been identified since the 4.1.0 release.

setup.py

@@ -129,7 +129,7 @@
                                  **backend_extension_kwargs))
 
 setup(name = "pygenn",
-      version = "0.3",
+      version = "0.3.1",
       packages = find_packages(),
       package_data={"pygenn": package_data},
 

version.txt

@@ -1 +1 @@
-4.2.0
+4.2.1