From: Guillaume Pellerin Date: Fri, 28 Nov 2014 14:17:17 +0000 (+0100) Subject: fix wsgi without X, update manifest and links X-Git-Tag: 0.7^2~38^2~7 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=10c765fc5156a63bb215e6399c75f1f8ab6e3074;p=timeside.git fix wsgi without X, update manifest and links --- diff --git a/MANIFEST.in b/MANIFEST.in index 1c1c248..86aa873 100644 --- 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 339dd09..a6af65c 100644 --- 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 abd22c5..7abb5c3 100644 --- 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 f611065..2be7975 100644 --- 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)