Merge branch 'master' into dtype-compatibility

obspy · Jun 19, 2014 · 5659400 · 5659400
2 parents ba2670d + 2ac13a7
commit 5659400
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,9 +25,9 @@ before_install:
   - pip freeze
 install:
   - git version
-  - git remote add obspy git://github.com/obspy/obspy.git
   - git fetch origin --tags --unshallow
-  - git fetch obspy --tags --unshallow
+  - git remote add obspy git://github.com/obspy/obspy.git
+  - git fetch obspy --tags
   - git status
   - pip install --no-deps --use-mirrors .
   - git status

diff --git a/misc/docs/Makefile b/misc/docs/Makefile
@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latex-png-images latexpdf-png-images latexpdf text man changes linkcheck doctest gettext coverage coverager pep8
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latex-png-images latexpdf-png-images latexpdf text man changes linkcheck doctest gettext coverage coverager pep8 citations credits
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -41,6 +41,7 @@ help:
 	@echo "  coverager  to make create coverage HTML files and report test"
 	@echo "  pep8       to check PEP8 of tutorial"
 	@echo "  citations  to generate citations page"
+	@echo "  credits    to generate credits page"
 
 clean:
 	@rm -rf $(BUILDDIR)/*
@@ -67,6 +68,9 @@ pep8:
 citations:
 	@python make_citations.py
 
+credits:
+	@python make_credits.py
+
 html:
 	if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
 	if [ ! -d $(BUILDDIR)/html ]; then mkdir $(BUILDDIR)/html; fi

diff --git a/misc/docs/make.bat b/misc/docs/make.bat
@@ -40,6 +40,7 @@ if "%1" == "help" (
 	echo.  coverager  to make create coverage HTML files and report test
 	echo.  pep8       to check PEP8 of tutorial
 	echo.  citations  to generate citations page
+    echo.  credits    to generate credits page
 	goto end
 )
 
@@ -74,6 +75,11 @@ if "%1" == "citations" (
 	goto end
 )
 
+if "%1" == "credits" (
+    python make_credits.py
+    goto end
+)
+
 if "%1" == "html" (
 :html
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html

diff --git a/misc/docs/make_credits.py b/misc/docs/make_credits.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+import codecs
+import os
+
+
+# generate credits
+fh = codecs.open(os.path.join('source', 'credits.rst'), 'w', 'utf-8')
+fh.write(""".. DON'T EDIT THIS FILE MANUALLY!
+   Instead edit txt files in the credits folder and
+   run ``make credits`` from command line to automatically create this file!
+
+Contributors
+============
+
+We would like to thank our contributors, whose efforts make this software what
+it is. These people have helped by writing code and documentation, and by
+testing. They have created and maintained this product, its associated
+libraries and applications, our build tools and our web sites.
+
+.. rubric:: Hall of Fame
+
+.. hlist::
+    :columns: 3
+
+""")
+
+# add contributers
+filename = os.path.join('source', 'credits', 'CONTRIBUTERS.txt')
+contributers = sorted(codecs.open(filename, 'r', 'utf-8').readlines())
+
+for item in contributers:
+    fh.write("    * %s" % (item))
+
+fh.write("""
+.. rubric:: Funds
+
+ObsPy was partially funded by the
+
+""")
+
+# add funds
+filename = os.path.join('source', 'credits', 'FUNDS.txt')
+funds = codecs.open(filename, 'r', 'utf-8').readlines()
+
+for item in funds:
+    fh.write("* %s" % (item))
+
+fh.write("""
+.. rubric:: Quotes
+
+""")
+
+# add quotes
+filename = os.path.join('source', 'credits', 'QUOTES.txt')
+funds = codecs.open(filename, 'r', 'utf-8').readlines()
+
+for item in funds:
+    fh.write("* %s" % (item))
+
+fh.close()
diff --git a/misc/docs/source/credits.rst b/misc/docs/source/credits.rst
@@ -1,3 +1,7 @@
+.. DON'T EDIT THIS FILE MANUALLY!
+   Instead edit txt files in the credits folder and
+   run ``make credits`` from command line to automatically create this file!
+
 Contributors
 ============
 
@@ -11,64 +15,61 @@ libraries and applications, our build tools and our web sites.
 .. hlist::
     :columns: 3
 
+    * Adolfo Inza
+    * Alberto Michelini
+    * Alessia Maggi
+    * Andreas Köhler
+    * Anthony Lomax
+    * Arthur Snoke
+    * Bernhard Morgenstern
+    * Chad Trabant
     * Charles J. Ammon
-    * Ólafur St. Arnarsson
-    * Robert Barsch
-    * Yannik Behr
-    * Felix Bernauer
-    * Moritz Beyreuther
-    * Sébastien Bonaimé
-    * Peter Danecek
-    * Martin van Driel
-    * Fabian Engels
-    * Sven Egdorf
+    * Chris Scheingraber
+    * Christian Sippl
+    * Claudio Satriano
     * Conny Hammer
-    * Sebastian Heimann
+    * David Ketchum
+    * Elliott Sales de Andrade
+    * Emiliano Russo
+    * Fabian Engels
+    * Felix Bernauer
     * Gaute Hope
-    * Seyed Kasra Hosseini Zad
     * Heiner Igel
-    * Adolfo Inza
+    * Joachim Saul
+    * Joachim Wassermann
+    * Lars Krieger
+    * Leonardo Uieda
+    * Lion Krischer
+    * Marcus Walther
     * Marius Isken
+    * Martin van Driel
+    * Moritz Beyreuther
+    * Nathaniel C. Miller
     * Paul Käufl
-    * David Ketchum
-    * Andreas Köhler
+    * Peter Danecek
+    * Philippe Lesage
+    * Robert Barsch
+    * Sebastian Heimann
+    * Seyed Kasra Hosseini Zad
     * Simon Kremers
-    * Victor Kress
-    * Lars Krieger
-    * Lion Krischer
+    * Stefan Stange
+    * Sven Egdorf
+    * Sébastien Bonaimé
     * Thomas Lecocq
-    * Philippe Lesage
-    * Anthony Lomax
-    * Alessia Maggi
     * Tobias Megies
-    * Alberto Michelini
-    * Bernhard Morgenstern
-    * Nathaniel C. Miller
     * Tom Richter
-    * Emiliano Russo
-    * Elliott Sales de Andrade
-    * Claudio Satriano
-    * Joachim Saul
-    * Chris Scheingraber
-    * Christian Sippl
-    * Arthur Snoke
-    * Stefan Stange
-    * Chad Trabant
     * Tommaso Fabbri
-    * Leonardo Uieda
-    * Marcus Walther
-    * Joachim Wassermann
+    * Victor Kress
+    * Yannik Behr
+    * Ólafur St. Arnarsson
 
 .. rubric:: Funds
 
 ObsPy was partially funded by the
 
 * German Science Foundation (DFG) via grant DFG IG 16/9-1
-* German Ministry for Education and Research (BMBF), GEOTECHNOLOGIEN
-  grant 03G0646H.
-* NERA project (Network of European Research Infrastructures for Earthquake
-  Risk Assessment and Mitigation) under the European Community's Seventh
-  Framework Programme (FP7/2007-2013) grant agreement n° 262330
+* German Ministry for Education and Research (BMBF), GEOTECHNOLOGIEN grant 03G0646H.
+* NERA project (Network of European Research Infrastructures for Earthquake Risk Assessment and Mitigation) under the European Community's Seventh Framework Programme (FP7/2007-2013) grant agreement n° 262330
 * Leibniz Institute for Applied Geophysics (LIAG)
 
 .. rubric:: Quotes

diff --git a/misc/docs/source/credits/CONTRIBUTERS.txt b/misc/docs/source/credits/CONTRIBUTERS.txt
@@ -0,0 +1,47 @@
+Charles J. Ammon
+Ólafur St. Arnarsson
+Robert Barsch
+Yannik Behr
+Felix Bernauer
+Moritz Beyreuther
+Sébastien Bonaimé
+Peter Danecek
+Martin van Driel
+Fabian Engels
+Sven Egdorf
+Conny Hammer
+Sebastian Heimann
+Gaute Hope
+Seyed Kasra Hosseini Zad
+Heiner Igel
+Adolfo Inza
+Marius Isken
+Paul Käufl
+David Ketchum
+Andreas Köhler
+Simon Kremers
+Victor Kress
+Lars Krieger
+Lion Krischer
+Thomas Lecocq
+Philippe Lesage
+Anthony Lomax
+Alessia Maggi
+Tobias Megies
+Alberto Michelini
+Bernhard Morgenstern
+Nathaniel C. Miller
+Tom Richter
+Emiliano Russo
+Elliott Sales de Andrade
+Claudio Satriano
+Joachim Saul
+Chris Scheingraber
+Christian Sippl
+Arthur Snoke
+Stefan Stange
+Chad Trabant
+Tommaso Fabbri
+Leonardo Uieda
+Marcus Walther
+Joachim Wassermann
diff --git a/misc/docs/source/credits/FUNDS.txt b/misc/docs/source/credits/FUNDS.txt
@@ -0,0 +1,4 @@
+German Science Foundation (DFG) via grant DFG IG 16/9-1
+German Ministry for Education and Research (BMBF), GEOTECHNOLOGIEN grant 03G0646H.
+NERA project (Network of European Research Infrastructures for Earthquake Risk Assessment and Mitigation) under the European Community's Seventh Framework Programme (FP7/2007-2013) grant agreement n° 262330
+Leibniz Institute for Applied Geophysics (LIAG)
diff --git a/misc/docs/source/credits/QUOTES.txt b/misc/docs/source/credits/QUOTES.txt
@@ -0,0 +1 @@
+"I believe that ObsPy is what will finally make students and some of my colleagues consider using Python for doing science!  I tell people of it whenever I get a chance."