# HG changeset patch # User primal primal007@gmail.com # Date 1322846906 -19800 # Node ID 54e05b1ec765b1bb859bfd87d5494d6bafaa630e # Parent b589c15fa60fbdadaf87170143b9cdd3ee7d4892 Changes in tutorial and schedule diff -r b589c15fa60f -r 54e05b1ec765 .hgignore --- a/.hgignore Fri Dec 02 16:48:56 2011 +0530 +++ b/.hgignore Fri Dec 02 22:58:26 2011 +0530 @@ -40,4 +40,5 @@ project/scipycon/user/*.pyc apache/* *.db - +buildout.cfg +project/production.py diff -r b589c15fa60f -r 54e05b1ec765 buildout.cfg --- a/buildout.cfg Fri Dec 02 16:48:56 2011 +0530 +++ b/buildout.cfg Fri Dec 02 22:58:26 2011 +0530 @@ -1,5 +1,5 @@ [buildout] -parts = django tagging django-robots south reportlab +parts = django tagging django-robots reportlab eggs = Werkzeug PIL @@ -26,7 +26,6 @@ pythonpath = ${tagging:location} ${django-robots:location} - ${south:location} [tagging] recipe = infrae.subversion @@ -36,6 +35,3 @@ recipe = zerokspot.recipe.git repository = https://github.com/jezdez/django-robots.git -[south] -recipe = mercurialrecipe -repository = http://bitbucket.org/andrewgodwin/south/ diff -r b589c15fa60f -r 54e05b1ec765 project/production.py --- a/project/production.py Fri Dec 02 16:48:56 2011 +0530 +++ b/project/production.py Fri Dec 02 22:58:26 2011 +0530 @@ -1,6 +1,6 @@ from project.settings import * -DEBUG=False +DEBUG=True TEMPLATE_DEBUG=DEBUG SITE_ID = 3 @@ -25,8 +25,8 @@ 'robots', ) -DATABASE_ENGINE = 'mysql' -DATABASE_NAME = 'scipycon' -DATABASE_USER = 'scipy' +#DATABASE_ENGINE = 'mysql' +#DATABASE_NAME = 'scipycon' +#DATABASE_USER = 'scipy' # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo -from project.local import DATABASE_PASSWORD +#from project.local import DATABASE_PASSWORD diff -r b589c15fa60f -r 54e05b1ec765 project/templates/about/tutorial.html --- a/project/templates/about/tutorial.html Fri Dec 02 16:48:56 2011 +0530 +++ b/project/templates/about/tutorial.html Fri Dec 02 22:58:26 2011 +0530 @@ -13,11 +13,11 @@ TimeSpeakerTitle -09:00-11:00Jarror MillmanGig/Github + NumPy/SciPy/MPL basics +09:00-11:00Puneeth ChagantiGit/Github + NumPy/SciPy/MPL basics 11:00-13:00Emmanuelle GouillartImage processing using NumPy, SciPy and scikits-image 13:00-14:00Lunch 14:00-16:00Gael VaroquauxMachine learning with scikit-learn -16:00-18:00Mateusz PaprockiSymPy +16:00-18:00Ole NielsenMapping and Geoprocessing with Python @@ -32,7 +32,7 @@ TimeSpeakerTitle -09:00-11:00Ole NielsenMapping and Geoprocessing with Python +09:00-11:00Mateusz PaprockiSymPy 11:00-13:00Eric JonesTraits + Traits UI 13:00-14:00Lunch 14:00-16:00Prabhu Ramachandran and Gael VaroquauxMayavi for 3D visualization @@ -78,7 +78,7 @@ -

Jarrod Millman, Git/Github + NumPy/SciPy/MPL basics (2 hrs)

+

Puneeth Chaganti, Git/Github + NumPy/SciPy/MPL basics (2 hrs)