[CalendarServer-changes] [2706] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Jul 16 12:50:17 PDT 2008


Revision: 2706
          http://trac.macosforge.org/projects/calendarserver/changeset/2706
Author:   cdaboo at apple.com
Date:     2008-07-16 12:50:17 -0700 (Wed, 16 Jul 2008)
Log Message:
-----------
We require Python 2.5 now so reflect that in the docs and test for 2.5 only in the scripts.

Modified Paths:
--------------
    CalendarServer/trunk/HACKING
    CalendarServer/trunk/README
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/HACKING
===================================================================
--- CalendarServer/trunk/HACKING	2008-07-16 17:52:23 UTC (rev 2705)
+++ CalendarServer/trunk/HACKING	2008-07-16 19:50:17 UTC (rev 2706)
@@ -98,10 +98,9 @@
 comply with these standards are welcome, and code chanegs that do not
 conform to these standards are discouraged.
 
-We require Python 2.4 or higher.  It is OK to write code that does not
-work with Python versions older than 2.4.  At present, adding code
-that requires Python 2.5 or newer is not allowed, but it is possible
-that we will move to require Python 2.5 in future versions.
+We require Python 2.5 or higher.  It is OK to write code that does not
+work with Python versions older than 2.5.  At present, adding code
+that requires the in-development Python 2.6/3.0 or newer is not allowed.
 
 Read PEP-8:
 

Modified: CalendarServer/trunk/README
===================================================================
--- CalendarServer/trunk/README	2008-07-16 17:52:23 UTC (rev 2705)
+++ CalendarServer/trunk/README	2008-07-16 19:50:17 UTC (rev 2706)
@@ -97,13 +97,12 @@
 Portability may be limited in this release.
 
 The server requires:
- * Python 2.4
+ * Python 2.5
  * Zope Interface 3.1.0c1
  * PyXML 0.8.4
  * pyOpenSSL 0.6
  * python-dateutil-1.0
  * xattr 0.2 (Bob Ippolito's implementation)
- * pysqlite-2.2.2
  * Twisted
  * vObject
  * PyKerberos
@@ -120,7 +119,7 @@
 building it as a feature of Mac OS X Server).
 
 If you are using Tiger (Mac OS 10.4), you will need to install Python
-2.4.  See http://pythonmac.org/packages/ for installable packages.
+2.5.  See http://pythonmac.org/packages/ for installable packages.
 
 If you are using other operating systems, there may be additional
 coding work required before you can get started.
@@ -142,21 +141,13 @@
 
     http://trac.calendarserver.org/projects/calendarserver/report/1
 
-PYTHON 2.4
+PYTHON 2.5
 ----------
 
-The Calendar Server was implemented using Python 2.4. A number of
-things would need to happen to get it to run using Python 2.3:
+The Calendar Server was implemented using Python 2.5. Backporting to
+earlier Python releases might be possible, however we use a number of
+language constructs specific to 2.5 that might make that hard.
 
- * All libraries the server depends on will need to work on Python 2.3.
-   vObject is known to require Python 2.4.
- * We use several Python 2.4 features.  Most are easy enough to back-port,
-   but nice to use if you have them:
-   * built-in set objects
-   * generator expressions
-   * decorator syntax
-
-
 GETTING INVOLVED
 ================
 

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2008-07-16 17:52:23 UTC (rev 2705)
+++ CalendarServer/trunk/bin/caldavd	2008-07-16 19:50:17 UTC (rev 2706)
@@ -49,7 +49,7 @@
   return 0;
 }
 
-for v in "" "2.5" "2.4"; do
+for v in "" "2.5"; do
   for p in                                                              \
     "${PYTHON:=}"                                                       \
     "python${v}"                                                        \

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2008-07-16 17:52:23 UTC (rev 2705)
+++ CalendarServer/trunk/run	2008-07-16 19:50:17 UTC (rev 2706)
@@ -117,12 +117,12 @@
 
   if ! type "${python}" > /dev/null 2>&1; then return 1; fi;
   local py_version="$(py_version "${python}")";
-  if [ "${py_version/./}" -lt "24" ]; then return 1; fi;
+  if [ "${py_version/./}" -lt "25" ]; then return 1; fi;
 
   return 0;
 }
 
-for v in "" "2.5" "2.4"; do
+for v in "" "2.5"; do
   for p in								\
     "${PYTHON:=}"							\
     "python${v}"							\
@@ -143,7 +143,7 @@
 done;
 
 if [ -z "${python:-}" ]; then
-  echo "No suitable python found.";
+  echo "No suitable python found. Python 2.5 is required.";
   exit 1;
 fi;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080716/c5e3bf5c/attachment.html 


More information about the calendarserver-changes mailing list