merge 2011
authorParth buch <parth.buch.115@gmail.com>
Sat, 03 Dec 2011 14:34:47 +0530
branch2011
changeset 492 3fcab949fc59
parent 483 08aaf89016e3 (diff)
parent 491 3c981ecb6b8e (current diff)
child 493 97c978a24a6d
merge
project/templates/_right_menu.html
project/templates/talk/conf_schedule.html
--- a/.hgignore	Sat Dec 03 12:51:00 2011 +0530
+++ b/.hgignore	Sat Dec 03 14:34:47 2011 +0530
@@ -40,4 +40,5 @@
 project/scipycon/user/*.pyc
 apache/*
 *.db
-
+buildout.cfg
+project/production.py
--- a/buildout.cfg	Sat Dec 03 12:51:00 2011 +0530
+++ b/buildout.cfg	Sat Dec 03 14:34:47 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/
--- a/project/production.py	Sat Dec 03 12:51:00 2011 +0530
+++ b/project/production.py	Sat Dec 03 14:34:47 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
Binary file project/static/files/Reaching_IITB.pdf has changed
--- a/project/templates/_right_menu.html	Sat Dec 03 12:51:00 2011 +0530
+++ b/project/templates/_right_menu.html	Sat Dec 03 14:34:47 2011 +0530
@@ -1,8 +1,9 @@
 <div style=" border: 1px black solid;">
 <h2 style="padding-left:2px;">News and Updates</h2>
 <ul>
-<li>Please contact our Information Desk for accommodation at IIT-Bombay main gate.</li>
-<li><a href="/scipyin/2011/talks-cfp/conference/">Updated Conference Schedule</a><font color="red">(New)</font></li>
+<li>Please contact our Kiosk setup for accomodation at IIT-Bombay main gate.</li>
+<li><a href="/scipyin/2011/talks-cfp/conference/">Updated Conference Schedule</a></li>
+<li> <a href="/static/files/Reaching_IITB.pdf">This</a> can help in you Reaching IITB.</li>
 <!-- <li>Please use <i>other links</i> for directions, maps and other information</li> -->
 </ul>
 </div>
--- a/project/templates/about/contact.html	Sat Dec 03 12:51:00 2011 +0530
+++ b/project/templates/about/contact.html	Sat Dec 03 14:34:47 2011 +0530
@@ -23,5 +23,11 @@
     Email id: primal@fossee.in <br/>
     </li>
     <br/><br/>
+    <li>
+    Deepak Kharat <br/>
+    Phone No: +919819650310 <br/>
+    Email id: deepak@fossee.in <br/>
+    </li>
+    <br/><br/>
 </div>
 {% endblock content %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/about/links.html	Sat Dec 03 14:34:47 2011 +0530
@@ -0,0 +1,1 @@
+`
--- a/project/templates/about/tutorial.html	Sat Dec 03 12:51:00 2011 +0530
+++ b/project/templates/about/tutorial.html	Sat Dec 03 14:34:47 2011 +0530
@@ -13,11 +13,11 @@
 <tr><th scope="col" class="right">Time</th><th scope="col" class="left">Speaker</th><th scope="col" class="left">Title</th></tr>
 </thead>
 <tbody>
-<tr><td class="right">09:00-11:00</td><td class="left">Jarrod Millman</td><td class="left"><a href="#sec2.1" >Git/Github + NumPy/SciPy/MPL basics</a></td></tr>
+<tr><td class="right">09:00-11:00</td><td class="left">Puneeth Chaganti</td><td class="left"><a href="#sec2.1" >Git/Github + NumPy/SciPy/MPL basics</a></td></tr>
 <tr><td class="right">11:00-13:00</td><td class="left">Emmanuelle Gouillart</td><td class="left"><a href="#sec2.2">Image processing using NumPy, SciPy and scikits-image</a></td></tr>
 <tr><td class="right">13:00-14:00</td><td class="left"></td><td class="left">Lunch</td></tr>
 <tr><td class="right">14:00-16:00</td><td class="left">Gael Varoquaux</td><td class="left"><a href="#sec2.3">Machine learning with scikit-learn</a></td></tr>
-<tr><td class="right">16:00-18:00</td><td class="left">Mateusz Paprocki</td><td class="left"><a href="#sec2.4">SymPy</a></td></tr>
+<tr><td class="right">16:00-18:00</td><td class="left">Ole Nielsen</td><td class="left"><a href="#sec2.5">Mapping and Geoprocessing with Python</a></td></tr>
 </tbody>
 </table>
 
@@ -32,7 +32,7 @@
 <tr><th scope="col" class="right">Time</th><th scope="col" class="left">Speaker</th><th scope="col" class="left">Title</th></tr>
 </thead>
 <tbody>
-<tr><td class="right">09:00-11:00</td><td class="left">Ole Nielsen</td><td class="left"><a href="#sec2.5">Mapping and Geoprocessing with Python</a></td></tr>
+<tr><td class="right">09:00-11:00</td><td class="left">Mateusz Paprocki</td><td class="left"><a href="#sec2.4">SymPy</a></td></tr>
 <tr><td class="right">11:00-13:00</td><td class="left">Eric Jones</td><td class="left"><a href="#sec2.6">Traits + Traits UI</a></td></tr>
 <tr><td class="right">13:00-14:00</td><td class="left"></td><td class="left">Lunch</td></tr>
 <tr><td class="right">14:00-16:00</td><td class="left">Prabhu Ramachandran and Gael Varoquaux</td><td class="left"><a href="#sec2.7">Mayavi for 3D visualization</a></td></tr>
@@ -78,7 +78,7 @@
 
 
 
-<h3 id="sec2.1">Jarrod Millman, Git/Github + NumPy/SciPy/MPL basics (2 hrs)</h3>
+<h3 id="sec2.1">Puneeth Chaganti, Git/Github + NumPy/SciPy/MPL basics (2 hrs)</h3>
 <ul>
 	<li>Git/Github</li>
 	<li>NumPy and SciPy basics along with the most important Matplotlib commands.
@@ -207,19 +207,19 @@
 	maps.
 	</li>
 	<li>
-	This tutorial will give a practical introduction to tools and techniques
+	T This tutorial will give a practical introduction to tools and techniques
  	available for processing spatial information and, through hands-on
-	exercises, give the participants a sense of how to manipulate spatial data
-	using Python. Depending on time, topics covered include reading and writing
-	of important data formats for both raster and vector data, looking at the
+	 exercises, give the participants a sense of how to manipulate spatial data
+	 using Python. Depending on time, topics covered include reading and writing
+	 of important data formats for both raster and vector data, looking at the
  	layers with qgis, awareness of issues with datums and projections,
  	calculating area and centroids of polygons, performance enhancement using
  	vector operations, numerical stability issues, calculation of distance
-	between points on the surface of Earth, interpolation from raster grids to
-	points etc. The tutorial has been developed for Ubuntu Linux 11.04/11.10 and
-	will provide source code, tests and data for this platform. However, the
-	content and messages should be general and apply to any self-respecting
-	platform.
+	 between points on the surface of Earth, interpolation from raster grids to
+	 points etc. The tutorial has been developed for Ubuntu Linux 11.04/11.10 and
+	 will provide source code, tests and data for this platform. However, the
+	 content and messages should be general and apply to any self-respecting
+	 platform.
 	</li>
 	<li>
 	I assume that participants know how to write and run Python scripts and are
@@ -228,9 +228,9 @@
  	Geographic Information Systems (GIS). The tutorial depends on the
  	packages qgis and gdal-bin as well as the python dependencies python-numpy
  	and python-gdal which are preloaded on the distributed live-DVD. The
- 	tutorial material itself will be available in the 
-	<a href="http://oles-tutorials.googlecode.com/svn/trunk/scipy2011">Subversion repository</a> 
-	and also on a usb stick that I will bring along.		
+ 	tutorial material itself will be available in the Subversion repository
+ 	http://oles-tutorials.googlecode.com/svn/trunk/scipy2011 and also on a USB
+ 	stick that I will bring along.		
 	</li>
 	<li>
 	If you have some spatial data you want to manipulate in Python feel free to
@@ -239,7 +239,6 @@
 </ul>
 
 
-
 <h3 id="sec2.6">Eric Jones: Traits + Traits UI (2 hrs)</h3> 
 <ul>
 	<li>
--- a/project/templates/talk/conf_schedule.html	Sat Dec 03 12:51:00 2011 +0530
+++ b/project/templates/talk/conf_schedule.html	Sat Dec 03 14:34:47 2011 +0530
@@ -23,11 +23,11 @@
 <tr><td class="right">13:20-14:05</td><td class="left">Ajith Kumar</td><td class="left"><b>Invited</b></td></tr>
 <tr><td class="right">14:05-14:25</td><td class="left">Bala Subrahmanyam Varanasi</td><td class="left"><a href="#sec2.6">Sentiment Analysis</a></td></tr>
 <tr><td class="right">14:25-14:55</td><td class="left">Jayneil Dalal</td><td class="left"><a href="#sec2.8">Building Embedded Systems for Image Processing using Python</a></td></tr>
-<tr><td class="right">14:55-15:05</td><td class="left">IITB Students</td><td class="left">Project Presentation</a></td></tr>
+<tr><td class="right">14:55-15:05</td><td class="left">IITB Students</td><td class="left"><a href="#sec2.24">Project Presentation</a></td></tr>
 <tr><td class="right">15:05-15:35</td><td class="left"></td><td class="left"><b>Tea Break</b></td></tr>
 <tr><td class="right">15:35-16:20</td><td class="left">Prabhu Ramachandran</td><td class="left"><b>Invited Talk</b></td></tr>
 
-<tr><td class="right">16:20-16:40</td><td class="left">Robson Benjamin</td><td class="left"><a href="#sec2.3">Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</a></td></tr>
+<tr><td class="right">16:20-16:40</td><td class="left">William Natharaj P.S</td><td class="left"><a href="#sec2.3">Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</a></td></tr>
 <tr><td class="right">16:40-17:00</td><td class="left">Nivedita Datta</td><td class="left"><a href="#sec2.10">Encryptedly yours : Python & Cryptography</a></td></tr>
 <tr><td class="right">17:10-17:30</td><td class="left"></td><td class="left"><b>Lightning Talks</b></td></tr>
 </tbody>
@@ -47,18 +47,17 @@
 <tr><td class="right">09:45-10:15</td><td class="left">Kannan Moudgalya</td><td class="left"><b>Invited</b></td></tr>
 <tr><td class="right">10:15-10:45</td><td class="left"></td><td class="left"><b>Tea</b></td></tr>
 <tr><td class="right">10:45-11:05</td><td class="left">Hrishikesh Deshpande</td><td class="left"><a href="#sec2.14">Higher Order Statistics in Python</a></td></tr>
-<tr><td class="right">11:05-11:25</td><td class="left">Kunal Puri</td><td class="left"><a href="#sec2.21">GPU Accelerated Computational Fluid Dynamics with Python</a></td></tr>
+<tr><td class="right">11:05-11:25</td><td class="left">Jaidev Deshpande</td><td class="left"><a href="#sec2.18">A Python Toolbox for the Hilbert-Huang Transform</a></td></tr>
 <tr><td class="right">11:25-12:10</td><td class="left">Emmanuelle</td><td class="left"><b>Invited</b></td></tr>
 <tr><td class="right">12:10-13:10</td><td class="left"></td><td class="left"><b>Lunch</b></td></tr>
-<tr><td class="right">13:10-13:30</td><td class="left">Vishal Kanaujia</td><td class="left"><a href="#sec2.7">Exploiting the power of multicore for scientific computing in Python</a></td></tr>
-<tr><td class="right">13:30-14:10</td><td class="left">Ole Nielsen</td><td class="left"><b>Invited</b></td></tr>
-<tr><td class="right">14:10-14:30</td><td class="left">Jaidev Deshpande</td><td class="left"><a href="#sec2.18">A Python Toolbox for the Hilbert-Huang Transform</a></td></tr>
-<tr><td class="right">14:30-15:00</td><td class="left">Chetan Giridhar</td><td class="left"><a href="#sec2.19">Diving in to Byte-code optimization in Python</a></td></tr>
-<tr><td class="right">15:00-15:30</td><td class="left"></td><td class="left"><b>Tea</b></td></tr>
-<tr><td class="right">15:30-16:00</td><td class="left">Mahendra Naik</td><td class="left"><a href="#sec2.13">Large amounts of data downloading and processing in python with facebook data as reference</a></td></tr>
-<tr><td class="right">16:00-16:10</td><td class="left">Sachin Shinde</td><td class="left"><a href="#sec2.22">Reverse Engineering and python</a></td></tr>
-<tr><td class="right">Cancled</td><td class="left">Shubham Chakraborty</td><td class="left"><a href="#sec2.15">Combination of Python and Phoenix-M as a low cost substitute for PLC</a></td></tr>
-<tr><td class="right">16:10-16:40</td><td class="left"></td><td class="left"><b>Lightning Talks</b></td></tr>
+<tr><td class="right">13:10-13:50</td><td class="left">Ole Nielsen</td><td class="left"><a href="#sec2.25">Invited Speaker: <b>7 Steps to Python Software That Works</b></a></td></tr>
+<tr><td class="right">13:50-14:20</td><td class="left">Kunal Puri</td><td class="left"><a href="#sec2.21">GPU Accelerated Computational Fluid Dynamics with Python</a></td></tr>
+<tr><td class="right">14:20-14:50</td><td class="left">Chetan Giridhar</td><td class="left"><a href="#sec2.19">Diving in to Byte-code optimization in Python</a></td></tr>
+<tr><td class="right">14:50-15:20</td><td class="left">Vishal Kanaujia</td><td class="left"><a href="#sec2.7">Exploiting the power of multicore for scientific computing in Python</a></td></tr>
+<tr><td class="right">15:20-15:50</td><td class="left"></td><td class="left"><b>Tea</b></td></tr>
+<tr><td class="right">15:50-16:10</td><td class="left">Mahendra Naik</td><td class="left"><a href="#sec2.13">Large amounts of data downloading and processing in python with facebook data as reference</a></td></tr>
+<tr><td class="right">16:10-16:20</td><td class="left">Sachin Shinde</td><td class="left"><a href="#sec2.22">Reverse Engineering and python</a></td></tr>
+<tr><td class="right">16:20-17:00</td><td class="left"></td><td class="left"><b>Lightning Talks</b></td></tr>
 </tbody>
 </table>
 <br/><br/>
@@ -76,7 +75,7 @@
 <h4>Slides</h4>
 <p>To be uploaded</p>
 
-<h3 id="sec2.3">Robson Benjamin : Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</h3>
+<h3 id="sec2.3">William Natharaj P.S: Automated Measurement of Magnetic properties of Ferro-Magnetic materials using Python</h3>
 <h4>Abstract</h4>
 <p>Hysterisis is basically a phenomenon where the behaviour of a system depends on the way the system moves.  
 On increasing the magnetizing field H applied to a magnetic material ,  
@@ -394,4 +393,39 @@
 </p>
 <h4>Slides</h4>
 <p>To be uploaded</p>
+
+<h3 id="sec2.24">IITB Students : Project Presentation</h3>
+<h4>Abstract</h4>
+<p>
+The following 2 projects(part of the <a href="http://fossee.in/sdes">SDES</a> course) which obtained the highest marks;  
+would be presented by respective project members.
+</p>
+<li>Digital Logic circuit simulator</li>
+<li>Analysis and modelling of cellular systems</li>
+<h4>Slides</h4>
+<p>To be uploaded</p>
+
+<h3 id="sec2.25">Dr Ole Nielsen : 7 Steps to Python Software That Works</h3>
+<h4>Abstract</h4>
+<p>
+I will give an overview of Python projects I have been leading over
+the past decade in academia, science agencies and government. These
+include large scale datamining, parallel computing, hydrodynamic
+modelling of tsunami impact and analysis of impact from natural
+disasters. All projects are based on Python (and numpy). The purpose
+of this talk is to summarise the practices I have come to see as
+essential to produce software that works robustly and sensibly
+is user and developer friendly, i.e. can be used and developed by a
+diverse and changing team eventually takes on a life of its own 
+without input from the core development team.
+</p>
+<p>
+Much of this will be known to many of you, but having worked in this
+field for some time now and seen much software it is my view that
+there is still a lot of Python code that could really shine if
+testing, source control, style guides, exception handling etc were
+observed more generally. To keep it real, I'll show real examples where appropriate.
+</p>
+<h4>Slides</h4>
+<p>To be uploaded</p>
 {% endblock content %}