[CalendarServer-changes] [12456] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:22:41 PDT 2014
Revision: 12456
http://trac.calendarserver.org//changeset/12456
Author: wsanchez at apple.com
Date: 2014-01-27 15:54:28 -0800 (Mon, 27 Jan 2014)
Log Message:
-----------
prefix py deps with py_
Modified Paths:
--------------
CalendarServer/trunk/bin/_build.sh
Added Paths:
-----------
CalendarServer/trunk/requirements/py_base.txt
CalendarServer/trunk/requirements/py_develop.txt
CalendarServer/trunk/requirements/py_opt_LDAP.txt
CalendarServer/trunk/requirements/py_opt_Oracle.txt
Removed Paths:
-------------
CalendarServer/trunk/requirements/base.txt
CalendarServer/trunk/requirements/develop.txt
CalendarServer/trunk/requirements/opt_LDAP.txt
CalendarServer/trunk/requirements/opt_Oracle.txt
Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/bin/_build.sh 2014-01-27 23:54:28 UTC (rev 12456)
@@ -107,9 +107,6 @@
python="${py_bindir}/python";
- export PATH="${py_root}/bin:${PATH}";
- export PYTHONPATH="${py_libdir}:${PYTHONPATH:-}"
-
# These variables are defaults for things which might be configured by
# environment; only set them if they're un-set.
@@ -550,8 +547,10 @@
# Build Python dependencies
#
py_dependencies () {
- for requirements in "${wd}/requirements/"*; do
+ export PATH="${py_root}/bin:${PATH}";
+ for requirements in "${wd}/requirements/py_"*".txt"; do
+
ruler "Preparing Python requirements: ${requirements}";
echo "";
@@ -562,7 +561,7 @@
; then
err=$?;
echo "Unable to set up Python requirements: ${requirements}";
- if [ "${requirements#${wd}/requirements/opt_}" != "${requirements}" ]; then
+ if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
echo "Requirements ${requirements} are optional; continuing.";
else
echo "";
Deleted: CalendarServer/trunk/requirements/base.txt
===================================================================
--- CalendarServer/trunk/requirements/base.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/base.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -1,26 +0,0 @@
-zope.interface==4.0.5
-twisted==13.2.0
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [DAL]
-
-# Twisted <3's SSL
-pyOpenSSL==0.12
-pycrypto==2.6.1
-pyasn1==0.1.7
-
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
-
-# Data store
-xattr==0.6.4
-PyGreSQL==4.1.1
-sqlparse==0.1.2
-
-# Calendar
-python-dateutil==1.5
-pytz==2013.8
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
-
-# Process info
-psutil==1.2.0
-setproctitle==1.1.8
-
-# pycparser==2.10
Deleted: CalendarServer/trunk/requirements/develop.txt
===================================================================
--- CalendarServer/trunk/requirements/develop.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/develop.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -1 +0,0 @@
-docutils>=0.11
Deleted: CalendarServer/trunk/requirements/opt_LDAP.txt
===================================================================
--- CalendarServer/trunk/requirements/opt_LDAP.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/opt_LDAP.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -1,2 +0,0 @@
-# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [LDAP]
-python-ldap>=2.4.13
Deleted: CalendarServer/trunk/requirements/opt_Oracle.txt
===================================================================
--- CalendarServer/trunk/requirements/opt_Oracle.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/opt_Oracle.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -1,2 +0,0 @@
-# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [Oracle]
-cx_Oracle==5.1.2
Copied: CalendarServer/trunk/requirements/py_base.txt (from rev 12455, CalendarServer/trunk/requirements/base.txt)
===================================================================
--- CalendarServer/trunk/requirements/py_base.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_base.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -0,0 +1,26 @@
+zope.interface==4.0.5
+twisted==13.2.0
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [DAL]
+
+# Twisted <3's SSL
+pyOpenSSL==0.12
+pycrypto==2.6.1
+pyasn1==0.1.7
+
+-e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
+
+# Data store
+xattr==0.6.4
+PyGreSQL==4.1.1
+sqlparse==0.1.2
+
+# Calendar
+python-dateutil==1.5
+pytz==2013.8
+-e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
+
+# Process info
+psutil==1.2.0
+setproctitle==1.1.8
+
+# pycparser==2.10
Copied: CalendarServer/trunk/requirements/py_develop.txt (from rev 12455, CalendarServer/trunk/requirements/develop.txt)
===================================================================
--- CalendarServer/trunk/requirements/py_develop.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_develop.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -0,0 +1 @@
+docutils>=0.11
Copied: CalendarServer/trunk/requirements/py_opt_LDAP.txt (from rev 12455, CalendarServer/trunk/requirements/opt_LDAP.txt)
===================================================================
--- CalendarServer/trunk/requirements/py_opt_LDAP.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_opt_LDAP.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -0,0 +1,2 @@
+# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [LDAP]
+python-ldap>=2.4.13
Copied: CalendarServer/trunk/requirements/py_opt_Oracle.txt (from rev 12455, CalendarServer/trunk/requirements/opt_Oracle.txt)
===================================================================
--- CalendarServer/trunk/requirements/py_opt_Oracle.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_opt_Oracle.txt 2014-01-27 23:54:28 UTC (rev 12456)
@@ -0,0 +1,2 @@
+# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [Oracle]
+cx_Oracle==5.1.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/244e40cf/attachment.html>
More information about the calendarserver-changes
mailing list