[CalendarServer-changes] [7841] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7841
          http://trac.macosforge.org/projects/calendarserver/changeset/7841
Author:   wsanchez at apple.com
Date:     2011-08-01 13:38:25 -0700 (Mon, 01 Aug 2011)
Log Message:
-----------
Require Python 2.6

Modified Paths:
--------------
    CalendarServer/trunk/HACKING
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/support/py.sh

Modified: CalendarServer/trunk/HACKING
===================================================================
--- CalendarServer/trunk/HACKING	2011-08-01 20:29:47 UTC (rev 7840)
+++ CalendarServer/trunk/HACKING	2011-08-01 20:38:25 UTC (rev 7841)
@@ -118,9 +118,8 @@
 comply with these standards are welcome, and code changes that do not
 conform to these standards are discouraged.
 
-**We require Python 2.5 or higher.** It therefore is OK to write code
-that does not work with Python versions older than 2.5.  At present,
-adding code that requires Python 2.6/3.0 or later is not allowed.
+**We require Python 2.6 or higher.** It therefore is OK to write code
+that does not work with Python versions older than 2.6.
 
 Read PEP-8:
 

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2011-08-01 20:29:47 UTC (rev 7840)
+++ CalendarServer/trunk/support/build.sh	2011-08-01 20:38:25 UTC (rev 7841)
@@ -699,14 +699,6 @@
           "http://${sf}/project/cx-oracle/5.1/${cx}.tar.gz";
   fi;
 
-  if [ "${py_version}" != "${py_version##2.5}" ] && \
-      ! py_have_module select26; then
-    local s26="select26-0.1a3";
-    py_dependency -m "01b8929e7cfc4a8deb777b92e3115c15" \
-      "select26" "select26" "${s26}" \
-      "${pypi}/s/select26/${s26}.tar.gz";
-  fi;
-
   local pg="PyGreSQL-4.0";
   py_dependency -v 4.0 -m "1aca50e59ff4cc56abe9452a9a49c5ff" -o \
     "PyGreSQL" "pgdb" "${pg}" \

Modified: CalendarServer/trunk/support/py.sh
===================================================================
--- CalendarServer/trunk/support/py.sh	2011-08-01 20:29:47 UTC (rev 7840)
+++ CalendarServer/trunk/support/py.sh	2011-08-01 20:38:25 UTC (rev 7841)
@@ -49,7 +49,7 @@
 # Detect which version of Python to use, then print out which one was detected.
 
 detect_python_version () {
-  for v in "2.7" "2.6" "2.5" ""
+  for v in "2.7" "2.6" ""
   do
     for p in                                                            \
       "${PYTHON:=}"                                                     \
@@ -180,7 +180,7 @@
   export PYTHON="$(type -p ${python})";
 
   if [ -z "${python:-}" ]; then
-    echo "No suitable python found. Python 2.5 is required.";
+    echo "No suitable python found. Python 2.6 is required.";
     exit 1;
   fi
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110801/71fd13f7/attachment-0001.html>