<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13187] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13187">13187</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-07 19:04:59 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't parse requirements in setup.py</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementstxt">CalendarServer/trunk/requirements.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>CalendarServer/trunk/requirements/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (13186 => 13187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-04-08 02:04:12 UTC (rev 13186)
+++ CalendarServer/trunk/bin/_build.sh 2014-04-08 02:04:59 UTC (rev 13187)
</span><span class="lines">@@ -620,26 +620,21 @@
</span><span class="cx"> if [ -d "${wd}/requirements/cache" ]; then
</span><span class="cx"> pip_install="pip_install_from_cache";
</span><span class="cx"> else
</span><del>- pip_install="pip_install";
</del><ins>+ pip_install="pip_download_and_install";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><del>- for requirements in "${wd}/requirements/py_"*".txt"; do
</del><ins>+ local requirements="${wd}/requirements.txt";
</ins><span class="cx">
</span><del>- ruler "Preparing Python requirements: ${requirements}";
- echo "";
</del><ins>+ ruler "Preparing Python requirements";
+ echo "";
+ "${pip_install}" "--requirement=${requirements}";
</ins><span class="cx">
</span><del>- if ! "${pip_install}" "${requirements}"; then
- err=$?;
- echo "Unable to set up Python requirements: ${requirements}";
- if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
- echo "Requirements ${requirements} are optional; continuing.";
- else
- echo "";
- echo "pip log: ${dev_home}/pip.log";
- return 1;
- fi;
</del><ins>+ 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
+ echo "Feature ${option} is optional; continuing.";
</ins><span class="cx"> fi;
</span><del>-
</del><span class="cx"> done;
</span><span class="cx">
</span><span class="cx"> echo "";
</span><span class="lines">@@ -647,21 +642,21 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> pip_install_from_cache () {
</span><del>- local requirements="$1"; shift;
</del><ins>+ local require="$1"; shift;
</ins><span class="cx">
</span><span class="cx"> "${python}" -m pip install \
</span><del>- --requirement="${requirements}" \
- --find-links "${wd}/requirements/cache" \
</del><ins>+ "${require}" \
+ --find-links="${wd}/requirements/cache" \
</ins><span class="cx"> --no-index \
</span><span class="cx"> --log="${dev_home}/pip.log";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-pip_install () {
- local requirements="$1"; shift;
</del><ins>+pip_download_and_install () {
+ local require="$1"; shift;
</ins><span class="cx">
</span><span class="cx"> "${python}" -m pip install \
</span><del>- --requirement="${requirements}" \
</del><ins>+ "${require}" \
</ins><span class="cx"> --download-cache="${dev_home}/pip_cache" \
</span><span class="cx"> --log="${dev_home}/pip.log";
</span><span class="cx"> }
</span></span></pre></div>
<a id="CalendarServertrunkrequirementstxt"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/requirements.txt (0 => 13187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements.txt (rev 0)
+++ CalendarServer/trunk/requirements.txt 2014-04-08 02:04:59 UTC (rev 13187)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+# Get our own dependencies
+--editable .
+
+# 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
</ins><span class="cx">Property changes on: CalendarServer/trunk/requirements.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (13186 => 13187)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2014-04-08 02:04:12 UTC (rev 13186)
+++ CalendarServer/trunk/setup.py 2014-04-08 02:04:59 UTC (rev 13187)
</span><span class="lines">@@ -18,13 +18,10 @@
</span><span class="cx">
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><del>-from itertools import chain
-from os import listdir, environ as environment
</del><span class="cx"> from os.path import dirname, basename, abspath, join as joinpath, normpath
</span><span class="cx"> import errno
</span><span class="cx"> import subprocess
</span><span class="cx">
</span><del>-from pip.req import parse_requirements
</del><span class="cx"> from setuptools import setup, find_packages as setuptools_find_packages
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -138,45 +135,47 @@
</span><span class="cx"> # Dependencies
</span><span class="cx"> #
</span><span class="cx">
</span><del>-reqs_extension = ".txt"
-reqs_opt_prefix = "py_opt_"
</del><ins>+cs_repos = "svn+http://svn.calendarserver.org/repository/calendarserver"
+twext_svn = "{}/twext/trunk#egg=twextpy".format(cs_repos)
</ins><span class="cx">
</span><ins>+setup_requirements = []
</ins><span class="cx">
</span><del>-requirements_dir = joinpath(dirname(__file__), "requirements")
</del><ins>+install_requirements = [
+ # Core frameworks
+ "zope.interface>=4.0.5",
+ "twisted>=13.2.0",
+ "twextpy",
</ins><span class="cx">
</span><ins>+ # Security frameworks
+ "pyOpenSSL>=0.12",
+ "pycrypto>=2.6.1",
+ "pyasn1>=0.1.7",
+ "kerberos",
</ins><span class="cx">
</span><del>-def read_requirements(reqs_filename):
- return [
- str(r.req) for r in
- parse_requirements(joinpath(requirements_dir, reqs_filename))
- ]
</del><ins>+ # Data store
+ "xattr>=0.6.4",
+ "twextpy[DAL]",
+ "sqlparse==0.1.2",
</ins><span class="cx">
</span><ins>+ # Calendar
+ "python-dateutil>=1.5",
+ "pytz>=2013.8",
+ "pycalendar",
</ins><span class="cx">
</span><del>-setup_requirements = []
</del><ins>+ # Process info
+ "psutil>=1.2.0",
+ "setproctitle>=1.1.8",
+]
</ins><span class="cx">
</span><del>-install_requirements = read_requirements("py_base.txt")
</del><ins>+extras_requirements = {
+ "LDAP": ["twextpy[LDAP]"],
+ "OpenDirectory": ["twextpy[OpenDirectory]"],
+ "Oracle": ["twextpy[Oracle]"],
+ "Postgres": ["twextpy[Postgres]"],
+}
</ins><span class="cx">
</span><del>-extras_requirements = dict(
- (
- reqs_filename[len(reqs_opt_prefix):-len(reqs_extension)],
- read_requirements(reqs_filename)
- )
- for reqs_filename in listdir(requirements_dir)
- if (
- reqs_filename.startswith(reqs_opt_prefix) and
- reqs_filename.endswith(reqs_extension)
- )
-)
</del><span class="cx">
</span><del>-# Requirements for development and testing
-develop_requirements = read_requirements("py_develop.txt")
</del><span class="cx">
</span><del>-if environment.get("_DEVELOP_PROJECT_", None) == name:
- install_requirements.extend(develop_requirements)
- install_requirements.extend(chain(*extras_requirements.values()))
-
-
-
</del><span class="cx"> #
</span><span class="cx"> # Set up Extension modules that need to be built
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>