Merge da8c9b9 into 82e2216

Makefile

@@ -55,9 +55,8 @@ cythonize:
 bdist_rpm:
 	$(PYTHON) setup.py bdist_rpm \
 	  --doc-files "doc" \
-	  --packager "nipy authors <http://mail.scipy.org/mailman/listinfo/nipy-devel>"
-	  --vendor "nipy authors <http://mail.scipy.org/mailman/listinfo/nipy-devel>"
-
+	  --packager "nipy authors <https://mail.python.org/mailman/listinfo/neuroimaging>"
+	  --vendor "nipy authors <https://mail.python.org/mailman/listinfo/neuroimaging>"
 
 # build MacOS installer -- depends on patched bdist_mpkg for Leopard
 bdist_mpkg:

THANKS

@@ -1,9 +1,9 @@
 NIPY is an open source project for neuroimaging analysis using Python.  It is a
 community project.  Many people have contributed to NIPY, in code development,
 and they are (mainly) listed in the AUTHOR file.  Others have contributed
-greatly code review, discussion, and financial support.  Below is a partial
-list.  If you've been left off, please let us know (nipy-devel at
-neuroimaging.scipy.org), and we'll add you.
+greatly in code review, discussion, and financial support.  Below is a partial
+list.  If you've been left off, please let us know (neuroimaging at
+python.org), and we'll add you.
 
 Michael Castelle
 Philippe Ciuciu

doc/Makefile

@@ -69,7 +69,7 @@ gitwash-update:
 	python ../tools/gitwash_dumper.py devel/guidelines nipy \
 		--github-user=nipy \
 		--project-url=http://nipy.org/nipy \
-		--project-ml-url=http://mail.scipy.org/mailman/listinfo/nipy-devel
+		--project-ml-url=https://mail.python.org/mailman/listinfo/neuroimaging
 
 pickle:
 	mkdir -p build/pickle build/doctrees

doc/_templates/layout.html

@@ -33,11 +33,11 @@ <h4> NIPY Community </h4>
     <li><a class="reference external"
 	href="http://nipy.org/">Community Home</a></li>
     <li><a class="reference external"
-	href="http://nipy.org/software/projects/">NIPY Projects</a></li>
+	href="http://nipy.org/project-directory">NIPY Projects</a></li>
     <li><a class="reference external"
-	href="http://mail.scipy.org/mailman/listinfo/nipy-devel">Mailing List</a></li>
+	href="https://mail.python.org/mailman/listinfo/neuroimaging">Mailing List</a></li>
     <li><a class="reference external"
-	href="http://nipy.org/software/license/index.html">License</a></li>
+	href="license.html">License</a></li>
   </ul>
 
 <h4> Github repo </h4>
@@ -57,7 +57,7 @@ <h3>Search mailing list archive</h3>
   <script type="text/javascript">
     function mlsearch(curobj)
     {
-    curobj.q.value="site:http://mail.scipy.org/pipermail/nipy-devel/ "+curobj.userquery.value
+    curobj.q.value="site:http://mail.python.org/pipermail/neuroimaging/ "+curobj.userquery.value
     }
   </script>
   <form action="http://www.google.com/search" method="get" onSubmit="mlsearch(this)">

doc/devel/guidelines/gitwash/git_links.inc

@@ -11,12 +11,12 @@
 .. PROJECTNAME placeholders
 .. _PROJECTNAME: http://neuroimaging.scipy.org
 .. _`PROJECTNAME github`: http://github.com/nipy
-.. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel
+.. _`PROJECTNAME mailing list`: https://mail.python.org/mailman/listinfo/neuroimaging
 
 .. nipy
 .. _nipy: http://nipy.org/nipy
 .. _`nipy github`: http://github.com/nipy/nipy
-.. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
+.. _`nipy mailing list`: https://mail.python.org/mailman/listinfo/neuroimaging
 
 .. ipython
 .. _ipython: http://ipython.scipy.org
@@ -26,12 +26,12 @@
 .. dipy
 .. _dipy: http://nipy.org/dipy
 .. _`dipy github`: http://github.com/Garyfallidis/dipy
-.. _`dipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
+.. _`dipy mailing list`: https://mail.python.org/mailman/listinfo/neuroimaging
 
 .. nibabel
 .. _nibabel: http://nipy.org/nibabel
 .. _`nibabel github`: http://github.com/nipy/nibabel
-.. _`nibabel mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
+.. _`nibabel mailing list`: https://mail.python.org/mailman/listinfo/neuroimaging
 
 .. marsbar
 .. _marsbar: http://marsbar.sourceforge.net

doc/links_names.txt

@@ -17,7 +17,7 @@
 .. _`NIPY data packages`: http://nipy.sourceforge.net/data-packages
 .. _`nipy github`: http://github.com/nipy/nipy
 .. _`nipy trunk`: http://github.com/nipy/nipy
-.. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel
+.. _`nipy mailing list`: https://mail.python.org/mailman/listinfo/neuroimaging
 .. _nipy pypi: http://pypi.python.org/pypi/nipy
 .. _nipy issues: http://github.com/nipy/nipy/issues
 .. _`nipy bugs`: http://github.com/nipy/nipy/issues

nipy/info.py

@@ -140,15 +140,15 @@
 
 NAME                = 'nipy'
 MAINTAINER          = "nipy developers"
-MAINTAINER_EMAIL    = "nipy-devel@neuroimaging.scipy.org"
+MAINTAINER_EMAIL    = "neuroimaging@python.org"
 DESCRIPTION         = description
 LONG_DESCRIPTION    = long_description
 URL                 = "http://nipy.org/nipy"
 DOWNLOAD_URL        = "http://github.com/nipy/nipy/archives/master"
 LICENSE             = "BSD license"
 CLASSIFIERS         = CLASSIFIERS
 AUTHOR              = "nipy developmers"
-AUTHOR_EMAIL        = "nipy-devel@neuroimaging.scipy.org"
+AUTHOR_EMAIL        = "neuroimaging@python.org"
 PLATFORMS           = "OS Independent"
 MAJOR               = _version_major
 MINOR               = _version_minor