[CalendarServer-changes] [12079] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:25:08 PDT 2014
Revision: 12079
http://trac.calendarserver.org//changeset/12079
Author: wsanchez at apple.com
Date: 2013-12-12 19:00:35 -0800 (Thu, 12 Dec 2013)
Log Message:
-----------
twext is now external
Modified Paths:
--------------
CalendarServer/trunk/setup.py
CalendarServer/trunk/support/build.sh
CalendarServer/trunk/test
Removed Paths:
-------------
CalendarServer/trunk/twext/
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/setup.py 2013-12-13 03:00:35 UTC (rev 12079)
@@ -15,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
+
from __future__ import print_function
import sys
@@ -26,18 +27,18 @@
-def find_modules():
+def find_packages():
modules = [
"twisted.plugins",
]
- for root, dirs, files in os.walk("."):
- excludes = [
- ".svn",
- "_trial_temp",
- "build",
- ]
+ excludes = [
+ ".svn",
+ "_trial_temp",
+ "build",
+ ]
+ for root, dirs, files in os.walk("."):
if root == ".":
excludes.append("data")
@@ -50,6 +51,7 @@
return modules
+
#
# Options
#
@@ -61,6 +63,7 @@
classifiers = None
+
#
# Write version file
#
@@ -75,16 +78,14 @@
version_file.write('version = "{version}"\n'.format(version=version_string))
version_file.close()
+
#
# Set up Extension modules that need to be built
#
from distutils.core import Extension
-extensions = [
- Extension("twext.python.sendmsg",
- sources=["twext/python/sendmsg.c"])
-]
+extensions = []
if sys.platform == "darwin":
extensions.append(
@@ -95,11 +96,7 @@
)
)
- from twext.python import launchd
- extensions.append(launchd.ffi.verifier.get_extension())
-
-
#
# Run setup
#
@@ -112,13 +109,13 @@
version=version_string,
description=description,
long_description=long_description,
- url=None,
+ url="http://www.calendarserver.org/",
classifiers=classifiers,
author="Apple Inc.",
author_email=None,
- license=None,
+ license="Apache License, Version 2.0",
platforms=["all"],
- packages=find_modules(),
+ packages=find_packages(),
package_data={
"twistedcaldav": [
"*.html",
@@ -237,6 +234,5 @@
newScript.close()
-
if __name__ == "__main__":
doSetup()
Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/support/build.sh 2013-12-13 03:00:35 UTC (rev 12079)
@@ -509,9 +509,7 @@
# already has it?
local inplace=""; # Do development in-place; don't run setup.py to
# build, and instead add the source directory plus the
- # given relative path directly to sys.path. twisted
- # and pycalendar are developed often enough that this is
- # convenient.
+ # given relative path directly to sys.path.
local skip_egg="false"; # Skip even the 'egg_info' step, because nothing needs
# to be built.
local revision="0"; # Revision (if svn)
@@ -777,6 +775,20 @@
"setuptools" "setuptools" "${st}" \
"$pypi/s/setuptools/${st}.tar.gz";
+ local v="0.6";
+ local n="cffi";
+ local p="${n}-${v}";
+ py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/c/${n}/${p}.tar.gz";
+
+ local v="2.10";
+ local n="pycparser";
+ local p="${n}-${v}";
+ py_dependency -v "0.6" -m "d87aed98c8a9f386aa56d365fe4d515f" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
local v="4.0.5";
local n="zope.interface";
local p="${n}-${v}";
@@ -793,8 +805,10 @@
local n="PyKerberos";
if type -P krb5-config > /dev/null; then
- py_dependency -r 9409 \
- "${n}" "kerberos" "${n}" \
+ local v="9409";
+ local p="${n}-${v}";
+ py_dependency -r "${v}" \
+ "${n}" "kerberos" "${p}" \
"${svn_uri_base}/${n}/trunk";
fi;
@@ -821,6 +835,27 @@
"${n}" "pgdb" "${p}" \
"${pypi}/P/${n}/${p}.tgz";
+ local v="0.1.2";
+ local n="sqlparse";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -s "978874e5ebbd78e6d419e8182ce4fb3c30379642" \
+ "SQLParse" "${n}" "${p}" \
+ "http://python-sqlparse.googlecode.com/files/${p}.tar.gz";
+
+ local v="2.6.1";
+ local n="pycrypto";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -m "55a61a054aa66812daf5161a0d5d7eda" \
+ "PyCrypto" "${n}" "${p}" \
+ "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
+
+ local v="0.1.7";
+ local n="pyasn1";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -m "2cbd80fcd4c7b1c82180d3d76fee18c8" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
local v="13.2.0";
local n="Twisted";
local p="${n}-${v}";
@@ -828,6 +863,13 @@
"${n}" "twisted" "${p}" \
"${pypi}/T/${n}/${p}.tar.bz2";
+ local v="12078";
+ local n="twext";
+ local p="${n}-${v}";
+ py_dependency -fe -r "${v}" \
+ "${n}" "${n}" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
+
local v="1.5";
local n="python-dateutil";
local p="${n}-${v}";
@@ -849,23 +891,26 @@
"Python-LDAP" "ldap" "${p}" \
"${pypi}/p/${n}/${p}.tar.gz";
- # XXX actually PyCalendar should be imported in-place.
- py_dependency -fe -i "src" -r 11947 \
- "PyCalendar" "pycalendar" "pycalendar" \
- "${svn_uri_base}/PyCalendar/trunk";
+ local v="11947";
+ local n="PyCalendar";
+ local p="${n}-${v}";
+ py_dependency -fe -i "src" -r "${v}" \
+ "${n}" "pycalendar" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
+ # Can't add "-v 2011g" to args because the version check expects numbers.
+ local v="2013.8";
+ local n="pytz";
+ local p="${n}-${v}";
+ py_dependency -m "37750ca749ed3a52523b9682b0b7e381" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
#
# Tool dependencies. The code itself doesn't depend on these, but
# they are useful to developers.
#
- local v="0.1.2";
- local n="sqlparse";
- local p="${n}-${v}";
- py_dependency -v "${v}" -s "978874e5ebbd78e6d419e8182ce4fb3c30379642" \
- "SQLParse" "${n}" "${p}" \
- "http://python-sqlparse.googlecode.com/files/${p}.tar.gz";
-
if type -P pyflakes > /dev/null; then
using_system "PyFlakes";
else
@@ -877,32 +922,13 @@
"${pypi}/p/${n}/${p}.tar.gz";
fi;
- py_dependency -o -r HEAD \
- "CalDAVClientLibrary" "caldavclientlibrary" "CalDAVClientLibrary" \
- "${svn_uri_base}/CalDAVClientLibrary/trunk";
-
- # Can't add "-v 2011g" to args because the version check expects numbers.
- local v="2013.8";
- local n="pytz";
+ local v="12068";
+ local n="CalDAVClientLibrary";
local p="${n}-${v}";
- py_dependency -m "37750ca749ed3a52523b9682b0b7e381" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
+ py_dependency -o -r "${v}" \
+ "${n}" "caldavclientlibrary" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
- local v="2.6.1";
- local n="pycrypto";
- local p="${n}-${v}";
- py_dependency -v "${v}" -m "55a61a054aa66812daf5161a0d5d7eda" \
- "PyCrypto" "${n}" "${p}" \
- "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
-
- local v="0.1.7";
- local n="pyasn1";
- local p="${n}-${v}";
- py_dependency -v "${v}" -m "2cbd80fcd4c7b1c82180d3d76fee18c8" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
-
local v="1.1.8";
local n="setproctitle";
local p="${n}-${v}";
@@ -910,20 +936,6 @@
"${n}" "${n}" "${p}" \
"${pypi}/s/${n}/${p}.tar.gz";
- local v="0.6";
- local n="cffi";
- local p="${n}-${v}";
- py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
- "${n}" "${n}" "${p}" \
- "${pypi}/c/${n}/${p}.tar.gz";
-
- local v="2.10";
- local n="pycparser";
- local p="${n}-${v}";
- py_dependency -v "0.6" -m "d87aed98c8a9f386aa56d365fe4d515f" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
-
svn_get "CalDAVTester" "${top}/CalDAVTester" \
"${svn_uri_base}/CalDAVTester/trunk" HEAD;
Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/test 2013-12-13 03:00:35 UTC (rev 12079)
@@ -80,7 +80,7 @@
test_modules="$@";
flaky=true;
else
- test_modules="calendarserver twistedcaldav twext txdav contrib ${m_twisted}";
+ test_modules="calendarserver twistedcaldav txdav contrib ${m_twisted}";
flaky=true;
fi;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/840694de/attachment.html>
More information about the calendarserver-changes
mailing list