Skip to content

Commit

Permalink
Merge b5b62d4 into 82e2216
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-brett committed Oct 17, 2015
2 parents 82e2216 + b5b62d4 commit c240521
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 25 deletions.
6 changes: 6 additions & 0 deletions AUTHOR
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
Alexis Roche <alexis.roche@gmail.com>
Ariel Rokem <arokem@gmail.com>
Bertrand Thirion <bertrand.thirion@inria.fr>
Brian Hawthrorne
Ben Cipollini <ben.cipollini@gmail.com>
Chris Burns <cburns@berkeley.edu>
Cindee Madison <cindee@berkeley.edu>
Elvis Dohmatob <gmdopp@gmail.com>
Endolith <endolith@gmail.com>
Fabian Pedregosa <f@bianp.net>
Fernando Perez <Fernando.Perez@berkeley.edu>
Gael Varoquaux <gael.varoquaux@normalesup.org>
Jarrod Millman <jarrod.millman@gmail.com>
Jean-Baptiste Poline <jbpoline@gmail.com>
Jonathan Taylor <jonathan.taylor@stanford.edu>
Matthew Brett <matthew.brett@gmail.com>
Merlin Keller
Michael Waskom
Mike Trumpis
Tim Leslie
Tom Waite
Expand Down
30 changes: 30 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,36 @@ Abbreviated authors are:
* AR - Alexis Roche
* GV - Gaël Varoquaux
* YH - Yarik Halchenko
* JBP - Jean-Baptiste Poline
* JT - Jonathan Taylor

* 0.4.0 (Saturday 18 October 2015)

* Bugfix, refactoring and compatibility release;
* Full port to Python 3 using single code-base;
* Various fixes for modern numpy, scipy, sympy, nibabel compatibility;
* Refactor space-time realignment (AR);
* Change in interface for slice-timing options in space-time realign
(AR+MB);
* New ``nipy_4d_realign`` script to run space-time realign (Ariel Rokem);
* Drop requirement for BLAS / LAPACK external library at build-time (AR);
* Move much code out of nipy.labs into main tree (AR, BT);
* Deprecate remaining code in nipy.labs (AR, BT);
* Updates to landmark learning code including API (BT);
* Various fixes to design matrix machinery (BT, Michael Waskom);
* Fix to two-sample permutation test suggested by github user jwirsich (BF);
* Refactoring and fixes to design matrix drift calculations (JBP);
* Extending API of resampling code to allow more ndimage kwargs (JBP);
* Start of new example on OpenFMRI ds105 dataset (JT);
* New ``block_design`` function for designs with specified onsets (JT);
* New ``show_contrast`` function for reviewing contrasts (JT);
* Fix for bug in ``nipy_diagnose`` script / ``screens`` module giving
incorrect PCA output;
* Added SPM HRF to other HRF options;
* Redesign concept of an image "space" with new image space modules,
functions, classes;
* Various fixes for correct installation provided or suggested by YH;
* Some visualization changes by Elvis Dohmatob;

* 0.3.0 (Saturday 2 February 2013)

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2006-2013, NIPY Developers
Copyright (c) 2006-2015, NIPY Developers
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
project = 'nipy'

#copyright = ':ref:`2005-2010, Neuroimaging in Python team. <nipy-software-license>`'
copyright = '2005-2013, Neuroimaging in Python team'
copyright = '2005-2015, Neuroimaging in Python team'

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
Expand Down
25 changes: 2 additions & 23 deletions doc/devel/guidelines/make_release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,11 @@ in the ``testers`` module of that package. nipy has Makefile targets for their
use. The relevant targets are::

make check-version-info
make check-files
make sdist-tests

The first installs the code from a git archive, from the repository, and for
This installs the code from a git archive, from the repository, and for
in-place use, and runs the ``get_info()`` function to confirm that installation
is working and information parameters are set correctly.

The second (``sdist-tests``) makes an sdist source distribution archive,
installs it to a temporary directory, and runs the tests of that install.

If you have a version of nibabel trunk past February 11th 2011, there will also
be a functional make target::

make bdist-egg-tests

This builds an egg (which is a zip file), hatches it (unzips the egg) and runs
the tests from the resulting directory.

.. _release-checklist:

Release checklist
Expand Down Expand Up @@ -62,7 +49,7 @@ Release checklist

* Check the copyright years in ``doc/conf.py`` and ``LICENSE``

* Refresh the ``REAMDE.rst`` text from the ``LONG_DESCRIPTION`` in ``info.py``
* Refresh the ``README.rst`` text from the ``LONG_DESCRIPTION`` in ``info.py``
by running ``make refresh-readme``.

Check the output of::
Expand Down Expand Up @@ -112,19 +99,11 @@ Release checking - buildbots
make distclean
python -m compileall .
make sdist-tests
make bdist-egg-tests
make check-version-info
make check-files

* You need to review the outputs for errors; at the moment this buildbot builder
does not check whether these tests passed or failed.
* ``make bdist-egg-tests`` may well fail because of a problem with the script
tests; if you have a recent (>= Jan 15 2013) nibabel ``nisext`` package, you
could try instead doing::

python -c 'from nisext.testers import bdist_egg_tests; bdist_egg_tests("nipy", label="not slow and not script_test")'

Eventually we should update the ``bdist-egg-tests`` makefile target.
* ``make check-version-info`` checks how the commit hash is stored in the
installed files. You should see something like this::

Expand Down

0 comments on commit c240521

Please sign in to comment.