[CalendarServer-changes] [13312] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13312
          http://trac.calendarserver.org//changeset/13312
Author:   wsanchez at apple.com
Date:     2014-04-17 14:37:13 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
Split requirements.txt into a base file and a requirements-dev.txt file.

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

Added Paths:
-----------
    CalendarServer/trunk/requirements-dev.txt

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-04-17 21:00:15 UTC (rev 13311)
+++ CalendarServer/trunk/bin/_build.sh	2014-04-17 21:37:13 UTC (rev 13312)
@@ -614,7 +614,9 @@
     rm -rf "${py_virtualenv}";
   fi;
 
-  "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}";
+  if [ -f "${py_virtualenv}" ]; then
+    "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}";
+  fi;
 
   # Make sure setup got called enough to write the version file.
 
@@ -628,7 +630,7 @@
 
   ruler "Preparing Python requirements";
   echo "";
-  "${pip_install}" --requirement="${wd}/requirements.txt";
+  "${pip_install}" --requirement="${wd}/requirements-dev.txt";
 
   for option in $("${python}" -c 'import setup; print "\n".join(setup.extras_requirements.keys())'); do
     ruler "Preparing Python requirements for optional feature: ${option}";

Copied: CalendarServer/trunk/requirements-dev.txt (from rev 13289, CalendarServer/trunk/requirements.txt)
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	                        (rev 0)
+++ CalendarServer/trunk/requirements-dev.txt	2014-04-17 21:37:13 UTC (rev 13312)
@@ -0,0 +1,10 @@
+# Get master requirements
+-r requirements.txt
+
+# Additional dependencies for development and testing
+pyflakes
+docutils
+mockldap
+q
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13311#egg=CalDAVClientLibrary
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13311#egg=CalDAVTester

Modified: CalendarServer/trunk/requirements.txt
===================================================================
--- CalendarServer/trunk/requirements.txt	2014-04-17 21:00:15 UTC (rev 13311)
+++ CalendarServer/trunk/requirements.txt	2014-04-17 21:37:13 UTC (rev 13312)
@@ -2,14 +2,6 @@
 --editable .
 
 # Specify editable dependencies explicitly since we want to get them from svn, not PyPI
---editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy
---editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
---editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
-
-# Additional dependencies for development
-pyflakes
-docutils
-mockldap
-q
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13311#egg=twextpy
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13311#egg=kerberos
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13311#egg=pycalendar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140417/a296a558/attachment-0001.html>