[CalendarServer-changes] [15233] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Oct 26 12:08:32 PDT 2015


Revision: 15233
          http://trac.calendarserver.org//changeset/15233
Author:   cdaboo at apple.com
Date:     2015-10-26 12:08:32 -0700 (Mon, 26 Oct 2015)
Log Message:
-----------
Fix some build dependencies.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-cs.txt
    CalendarServer/trunk/requirements-twisted-default.txt
    CalendarServer/trunk/support/_cache_deps

Modified: CalendarServer/trunk/requirements-cs.txt
===================================================================
--- CalendarServer/trunk/requirements-cs.txt	2015-10-26 17:26:14 UTC (rev 15232)
+++ CalendarServer/trunk/requirements-cs.txt	2015-10-26 19:08:32 UTC (rev 15233)
@@ -5,6 +5,7 @@
 --editable .  # calendarserver
 
     zope.interface==4.1.2
+	    setuptools==17.0
 
     --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15216#egg=twextpy
         #cffi==1.3.0

Modified: CalendarServer/trunk/requirements-twisted-default.txt
===================================================================
--- CalendarServer/trunk/requirements-twisted-default.txt	2015-10-26 17:26:14 UTC (rev 15232)
+++ CalendarServer/trunk/requirements-twisted-default.txt	2015-10-26 19:08:32 UTC (rev 15233)
@@ -24,6 +24,6 @@
             #cffi
             enum34==1.0.4
             ipaddress
-            setuptools==17.0
+            #setuptools==17.0
             #six
         six==1.9.0

Modified: CalendarServer/trunk/support/_cache_deps
===================================================================
--- CalendarServer/trunk/support/_cache_deps	2015-10-26 17:26:14 UTC (rev 15232)
+++ CalendarServer/trunk/support/_cache_deps	2015-10-26 19:08:32 UTC (rev 15233)
@@ -77,10 +77,13 @@
 export PYTHONPATH="${py_ve_tools}/lib:${wd}:${PYTHONPATH:-}";
 bootstrap_virtualenv;
 
-reqs_to_use="${ve_tmp}/requirements.txt";
+reqs_to_use="${ve_tmp}/requirements-osx.txt";
 
-sed -e '/python-ldap/d' < "${requirements}" > "${reqs_to_use}";
-echo "xattr==0.7.5" >> "${reqs_to_use}";
+# Copy over each requirements file we need and edit a few to remove stuff we don't need
+sed -e '/requirements-dev.txt/d' < "${wd}/requirements-osx.txt" > "${ve_tmp}/requirements-osx.txt";
+sed -e '/python-ldap/d' < "${wd}/requirements-cs.txt" > "${ve_tmp}/requirements-cs.txt";
+echo "xattr==0.7.5" >> "${ve_tmp}/requirements-cs.txt";
+cp "${wd}/requirements-twisted-osx.txt" "${ve_tmp}/";
 
 ruler "Downloading Python requirements for .[${extra_features}]";
 echo "";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151026/6b25cec2/attachment.html>


More information about the calendarserver-changes mailing list