[CalendarServer-changes] [15744] twext/trunk

[source_changes at macosforge.org]

Revision: 15744
          http://trac.calendarserver.org//changeset/15744
Author:   cdaboo at apple.com
Date:     2016-07-06 18:33:01 -0700 (Wed, 06 Jul 2016)
Log Message:
-----------
Updating to latest python packages and simplifying venv bootstrap.

Modified Paths:
--------------
    twext/trunk/bin/_build.sh
    twext/trunk/setup.py
    twext/trunk/twext/enterprise/adbapi2.py
    twext/trunk/twext/python/log.py

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/bin/_build.sh	2016-07-07 01:33:01 UTC (rev 15744)
@@ -594,37 +594,15 @@
 
 bootstrap_virtualenv () {
   mkdir -p "${py_ve_tools}";
-  mkdir -p "${py_ve_tools}/lib";
-  mkdir -p "${py_ve_tools}/junk";
+  export PYTHONUSERBASE="${py_ve_tools}"
 
   for pkg in             \
-      setuptools-17.0  \
-      pip-7.0.3          \
-      virtualenv-13.0.3  \
+      setuptools==18.5    \
+      pip==8.1.2          \
+      virtualenv==15.0.2  \
   ; do
-      local    name="${pkg%-*}";
-      local version="${pkg#*-}";
-      local  first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
-      local    url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
-
-      ruler "Downloading ${pkg}";
-
-      local tmp="$(mktemp -d -t ccsXXXXX)";
-
-      curl -L "${url}" | tar -C "${tmp}" -xvzf -;
-
-      cd "${tmp}/$(basename "${pkg}")";
-      PYTHONPATH="${py_ve_tools}/lib"                \
-        "${bootstrap_python}" setup.py install       \
-            --install-base="${py_ve_tools}"          \
-            --install-lib="${py_ve_tools}/lib"       \
-            --install-headers="${py_ve_tools}/junk"  \
-            --install-scripts="${py_ve_tools}/junk"  \
-            --install-data="${py_ve_tools}/junk"     \
-            ;                                        \
-      cd "${wd}";
-
-      rm -rf "${tmp}";
+      ruler "Installing ${pkg}";
+      "${bootstrap_python}" -m pip install -I --user "${pkg}";
   done;
 }
 

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/setup.py	2016-07-07 01:33:01 UTC (rev 15744)
@@ -240,7 +240,7 @@
 
 install_requirements = [
     "cffi",
-    "twisted>=15.4",
+    "twisted>=16.3",
 ]
 
 extras_requirements = {

Modified: twext/trunk/twext/enterprise/adbapi2.py
===================================================================
--- twext/trunk/twext/enterprise/adbapi2.py	2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/twext/enterprise/adbapi2.py	2016-07-07 01:33:01 UTC (rev 15744)
@@ -1696,7 +1696,7 @@
 
         @rtype: L{IAsyncTransaction}
         """
-        txnid = str(self._nextID())
+        txnid = self._nextID()
         txn = _NetTransaction(client=self, transactionID=txnid)
         self._txns[txnid] = txn
         self.callRemote(StartTxn, transactionID=txnid)

Modified: twext/trunk/twext/python/log.py
===================================================================
--- twext/trunk/twext/python/log.py	2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/twext/python/log.py	2016-07-07 01:33:01 UTC (rev 15744)
@@ -19,6 +19,7 @@
     FileLogObserver, FilteringLogObserver, LogLevelFilterPredicate, \
     formatEventAsClassicLogText, formatTime
 from twisted.python import log
+from twisted import logger
 
 class Logger(_Logger):
     """
@@ -108,4 +109,4 @@
 
 
 Logger.logBeginner = FilteringLogBeginnerWrapper(log.theLogPublisher._logBeginner)
-log.theLogPublisher._logBeginner = Logger.logBeginner
+logger.globalLogBeginner = Logger.logBeginner
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160706/b61fba7a/attachment.html>