[CalendarServer-changes] [13208] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13208
          http://trac.calendarserver.org//changeset/13208
Author:   wsanchez at apple.com
Date:     2014-04-08 16:02:16 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
Need --pre flag to pip install to enable svn targets.

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh
    CalendarServer/trunk/requirements.txt

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-04-08 22:34:35 UTC (rev 13207)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-08 23:02:16 UTC (rev 13208)
@@ -632,7 +632,7 @@
   for option in $("${python}" -c 'import setup; print "\n".join(setup.extras_requirements.keys())'); do
     ruler "Preparing Python requirements for optional feature: ${option}";
     echo "";
-    if ! "${pip_install}" "--editable=.[${option}]"; then
+    if ! "${pip_install}" "--editable=${wd}[${option}]"; then
       echo "Feature ${option} is optional; continuing.";
     fi;
   done;
@@ -657,6 +657,7 @@
 
   "${python}" -m pip install                  \
     "${require}"                              \
+    --pre                                     \
     --download-cache="${dev_home}/pip_cache"  \
     --log="${dev_home}/pip.log";
 }

Modified: CalendarServer/trunk/requirements.txt
===================================================================
--- CalendarServer/trunk/requirements.txt	2014-04-08 22:34:35 UTC (rev 13207)
+++ CalendarServer/trunk/requirements.txt	2014-04-08 23:02:16 UTC (rev 13208)
@@ -1,15 +1,13 @@
 # Get our own dependencies
 --editable .
 
+# Specify editable dependencies explicitly since they won't be in PyPI
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy
+
 # Additional dependencies for development
 pyflakes
 docutils>=0.11
 mockldap>=0.1.4
 q
--e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=CalDAVClientLibrary
--e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk#egg=CalDAVTester
-
-# Provide hints for finding packages
---find-links svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy
---find-links svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
---find-links svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=CalDAVClientLibrary
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk#egg=CalDAVTester
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140408/67b4d0ac/attachment.html>