fix wsgi without X, update manifest and links

diff --git a/MANIFEST.in b/MANIFEST.in
index 1c1c248a56a6e15b2d1556b5a4cbf00562ab4086..86aa8736b238076467d445e78f6c8a3a36a08a57 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,6 @@
+global-exclude *.pyc
+prune dist
+prune build
 include AUTHORS.txt
 include LICENSE.txt
 include README.rst
@@ -9,10 +12,10 @@ recursive-include timeside *
 recursive-include examples *
 recursive-include tests *
 recursive-exclude examples/sandbox/media *
-recursive-exclude * *.pyc
 recursive-exclude * *.swp
 recursive-exclude dist *
 recursive-exclude build *
 recursive-exclude tests/samples *
 recursive-exclude tests/results *
 recursive-exclude doc/build *
+global-exclude *.pyc
\ No newline at end of file

diff --git a/README.rst b/README.rst
index 339dd091fbab021972b2c2c9065e58f583bf9ece..a6af65c45d91cc373be70d6d5052473158bebecf 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -198,9 +198,10 @@ API / Documentation
 * General : http://files.parisson.com/timeside/doc/
 * Tutorial : http://files.parisson.com/timeside/doc/tutorial/index.html
 * API : http://files.parisson.com/timeside/doc/api/index.html
+* Publications : https://github.com/Parisson/Telemeta-doc
 * Player / UI : https://github.com/Parisson/TimeSide/wiki/Ui-Guide (see also "Web player")
 * Notebooks : http://nbviewer.ipython.org/github/thomasfillon/Timeside-demos/tree/master/
-* Usage : http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_2004_017_001_01/
+* Example : http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_2004_017_001_01/
 
 Install
 =======

diff --git a/doc/source/doc.rst b/doc/source/doc.rst
index abd22c538adf5fcaebf2de4c5cf0c1cff6eeee8f..7abb5c3b1761e799b16cf184389899c7c9828967 100644 (file)
--- a/doc/source/doc.rst
+++ b/doc/source/doc.rst
@@ -4,7 +4,8 @@ API / Documentation
 * General : http://files.parisson.com/timeside/doc/
 * Tutorial : http://files.parisson.com/timeside/doc/tutorial/index.html
 * API : http://files.parisson.com/timeside/doc/api/index.html
+* Publications : https://github.com/Parisson/Telemeta-doc
 * Player / UI : https://github.com/Parisson/TimeSide/wiki/Ui-Guide (see also "Web player")
 * Notebooks : http://nbviewer.ipython.org/github/thomasfillon/Timeside-demos/tree/master/
-* Usage : http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_2004_017_001_01/
+* Example : http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_2004_017_001_01/
 

diff --git a/examples/sandbox/wsgi.py b/examples/sandbox/wsgi.py
index f611065cc0eaa0dd4c3aa08342abe03e3792499c..2be797550232d4cfc7641b1c0acb2521c04e41e3 100644 (file)
--- a/examples/sandbox/wsgi.py
+++ b/examples/sandbox/wsgi.py
@@ -15,14 +15,17 @@ framework.
 """
 import os, sys
 
+#os.environ[ 'MPLCONFIGDIR' ] = '/home/$USER/.matplotlib'
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
+# Force matplotlib to not use any Xwindows backend.
+import matplotlib
+matplotlib.use('Agg')
+
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
 
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)