[CalendarServer-changes] [14265] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jan 7 19:08:38 PST 2015
Revision: 14265
http://trac.calendarserver.org//changeset/14265
Author: wsanchez at apple.com
Date: 2015-01-07 19:08:38 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
Remove pyasn1, pyasn1_modules, characteristic, which are subdependencies.
Modified Paths:
--------------
CalendarServer/trunk/requirements-stable.txt
CalendarServer/trunk/setup.py
CalendarServer/trunk/support/Apple.make
Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- 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)
@@ -1,34 +1,77 @@
-# 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
+##
+#
+# 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
+#
+##
-# For CalendarServer development, don't try to get these projects from PyPI; use svn.
+-e . # calendarserver
--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
+ zope.interface==4.1.1
-# Specify specific versions of our dependencies so that we're all testing the same config.
+ 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
-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
+ -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
Modified: CalendarServer/trunk/setup.py
===================================================================
--- 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)
@@ -235,12 +235,9 @@
"twextpy",
# Security frameworks
- "pyOpenSSL>=0.13.1",
- "service_identity",
- "pycrypto",
- "pyasn1",
- "pyasn1_modules",
- "characteristic",
+ "pyOpenSSL>=0.13.1", # also for Twisted
+ "service_identity", # for Twisted
+ "pycrypto", # for Twisted
"kerberos",
# Data store
Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- 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)
@@ -89,7 +89,10 @@
@echo "Creating virtual environment...";
$(_v) $(RMDIR) "$(DSTROOT)$(CS_VIRTUALENV)";
$(_v) PYTHONPATH="$(BuildDirectory)/pytools/lib" \
- "$(PYTHON)" -m virtualenv --system-site-packages "$(DSTROOT)$(CS_VIRTUALENV)";
+ "$(PYTHON)" -m virtualenv \
+ --system-site-packages \
+ --always-copy \
+ "$(DSTROOT)$(CS_VIRTUALENV)";
@#
@# Use the pip in the virtual environment to install.
@# It knows about where things go in the virtual environment.
@@ -118,18 +121,18 @@
@echo "Putting comments into empty files...";
$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.py" -exec sh -c 'printf "# empty\n" > {}' ";";
$(_v) find "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -name "*.h" -exec sh -c 'printf "/* empty */\n" > {}' ";";
- @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;
+ # @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;
install:: install-config
install-config::
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150107/53934b4a/attachment.html>
More information about the calendarserver-changes
mailing list