<!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>[14265] 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/14265">14265</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 19:08:38 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove pyasn1, pyasn1_modules, characteristic, which are subdependencies.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (14264 => 14265)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-01-08 03:07:52 UTC (rev 14264)
+++ CalendarServer/trunk/requirements-stable.txt 2015-01-08 03:08:38 UTC (rev 14265)
</span><span class="lines">@@ -1,34 +1,77 @@
</span><del>-# This file should contain everything in the output of:
-# ./bin/python -m pip freeze --local
-# with the exception of any modules obtained via requirements-dev.plist
</del><ins>+##
+#
+# Specify specific versions of our dependencies here.
+#
+##
+#
+# This defines the versions of dependencies that we are developing and
+# testing with.
+#
+# Other versions of dependencies are likely to work in most cases, but
+# here you can see what our automated builds are using, so this
+# combination is known to work.
+#
+##
+#
+# This file should contain every module in the output of:
+# ./bin/dependencies -a
+#
+##
</ins><span class="cx">
</span><del>-# For CalendarServer development, don't try to get these projects from PyPI; use svn.
</del><ins>+-e . # calendarserver
</ins><span class="cx">
</span><del>--e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14260#egg=twextpy
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14245#egg=pycalendar
</del><ins>+ zope.interface==4.1.1
</ins><span class="cx">
</span><del>-# Specify specific versions of our dependencies so that we're all testing the same config.
</del><ins>+ Twisted==14.0.2
+ #zope.interface
+ # NOTE: Twisted also uses pyOpenSSL, pycrypto and service_identity,
+ # but doesn't specify them as dependencies, so that are explicitly
+ # added to calendarserver.
+ #pyOpenSSL
+ service_identity==14.0.0
+ characteristic==14.0.0
+ pyasn1==0.1.7
+ pyasn1-modules==0.0.5
+ #pyOpenSSL
+ pycrypto==2.6.1
</ins><span class="cx">
</span><del>-cffi==0.8.6
-funcparserlib==0.3.6
-psutil==2.1.3
-pyasn1==0.1.7
-pyasn1_modules==0.0.5
-pycparser==2.10
-pycrypto==2.6.1
-PyGreSQL==4.1.1
-pyOpenSSL==0.14
-service_identity==14.0.0
-cryptography==0.6.1
-characteristic==14.0.0
-python-dateutil==1.5 # Note: v2.0+ is for Python 3
-python-ldap==2.4.18
-pytz==2014.10
-setproctitle==1.1.8
-sqlparse==0.1.14
-Twisted==14.0.2
-wheel==0.24.0
-xattr==0.7.5
-zope.interface==4.1.1
</del><ins>+ -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14260#egg=twextpy
+ cffi==0.8.6
+ pycparser==2.10
+ #twisted
+ #[DAL]
+ sqlparse==0.1.14
+
+ pyOpenSSL==0.14
+ cryptography==0.7.1
+ #cffi
+ setuptools==11.3.1
+ #six
+ six==1.9.0
+
+ -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
+
+ xattr==0.7.5
+ #cffi
+
+ python-dateutil==1.5 # Note: v2.0+ is for Python 3
+
+ pytz==2014.10
+
+ -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14245#egg=pycalendar
+
+ psutil==2.1.3
+
+ setproctitle==1.1.8
+
+ # LDAP extra
+ python-ldap==2.4.18
+
+ # OpenDirectory extra
+ #pyobjc-framework-opendirectory # Use system module
+
+ # Postgres extra
+ PyGreSQL==4.1.1
+
+ # Oracle extra
+ #cx-oracle # Not in PyPI
</ins></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (14264 => 14265)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2015-01-08 03:07:52 UTC (rev 14264)
+++ CalendarServer/trunk/setup.py 2015-01-08 03:08:38 UTC (rev 14265)
</span><span class="lines">@@ -235,12 +235,9 @@
</span><span class="cx"> "twextpy",
</span><span class="cx">
</span><span class="cx"> # Security frameworks
</span><del>- "pyOpenSSL>=0.13.1",
- "service_identity",
- "pycrypto",
- "pyasn1",
- "pyasn1_modules",
- "characteristic",
</del><ins>+ "pyOpenSSL>=0.13.1", # also for Twisted
+ "service_identity", # for Twisted
+ "pycrypto", # for Twisted
</ins><span class="cx"> "kerberos",
</span><span class="cx">
</span><span class="cx"> # Data store
</span></span></pre></div>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (14264 => 14265)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make 2015-01-08 03:07:52 UTC (rev 14264)
+++ CalendarServer/trunk/support/Apple.make 2015-01-08 03:08:38 UTC (rev 14265)
</span><span class="lines">@@ -89,7 +89,10 @@
</span><span class="cx"> @echo "Creating virtual environment...";
</span><span class="cx"> $(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
</span><span class="cx"> $(_v) PYTHONPATH="$(BuildDirectory)/pytools/lib" \
</span><del>- "$(PYTHON)" -m virtualenv --system-site-packages "$(DSTROOT)$(CS_VIRTUALENV)";
</del><ins>+ "$(PYTHON)" -m virtualenv \
+ --system-site-packages \
+ --always-copy \
+ "$(DSTROOT)$(CS_VIRTUALENV)";
</ins><span class="cx"> @#
</span><span class="cx"> @# Use the pip in the virtual environment to install.
</span><span class="cx"> @# It knows about where things go in the virtual environment.
</span><span class="lines">@@ -118,18 +121,18 @@
</span><span class="cx"> @echo "Putting comments into empty files...";
</span><span class="cx"> $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.py" -exec sh -c 'printf "# empty\n" > {}' ";";
</span><span class="cx"> $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.h" -exec sh -c 'printf "/* empty */\n" > {}' ";";
</span><del>- @echo "Replacing symbolic links...";
- $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type l | \
- while read link; do \
- target="$$(readlink "$${link}")"; \
- if [ "$$(echo $${target} | cut -f 1 -d /)" == "" ]; then \
- rm -fv "$${link}"; \
- cp -aLfv "$${target}" "$${link}" || { \
- rm -rfv "$${link}"; \
- ln -sfv "$${target}" "$${link}"; \
- } \
- fi; \
- done;
</del><ins>+ # @echo "Replacing symbolic links...";
+ # $(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type l | \
+ # while read link; do \
+ # target="$$(readlink "$${link}")"; \
+ # if [ "$$(echo $${target} | cut -f 1 -d /)" == "" ]; then \
+ # rm -fv "$${link}"; \
+ # cp -aLfv "$${target}" "$${link}" || { \
+ # rm -rfv "$${link}"; \
+ # ln -sfv "$${target}" "$${link}"; \
+ # } \
+ # fi; \
+ # done;
</ins><span class="cx">
</span><span class="cx"> install:: install-config
</span><span class="cx"> install-config::
</span></span></pre>
</div>
</div>
</body>
</html>