[CalendarServer-changes] [13849] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13849
          http://trac.calendarserver.org//changeset/13849
Author:   cdaboo at apple.com
Date:     2014-08-07 09:14:03 -0700 (Thu, 07 Aug 2014)
Log Message:
-----------
Fix setup.py to work with newer setuptools.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/setup.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2014-08-07 15:05:51 UTC (rev 13848)
+++ CalendarServer/trunk/requirements-dev.txt	2014-08-07 16:14:03 UTC (rev 13849)
@@ -7,4 +7,4 @@
 mockldap
 q
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13827#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13847#egg=CalDAVTester

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-08-07 15:05:51 UTC (rev 13848)
+++ CalendarServer/trunk/requirements-stable.txt	2014-08-07 16:14:03 UTC (rev 13849)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13840#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13848#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@13802#egg=pycalendar
 

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2014-08-07 15:05:51 UTC (rev 13848)
+++ CalendarServer/trunk/setup.py	2014-08-07 16:14:03 UTC (rev 13849)
@@ -19,12 +19,12 @@
 from __future__ import print_function
 
 from os.path import dirname, basename, abspath, join as joinpath, normpath
+from setuptools import setup, find_packages as setuptools_find_packages
 import errno
+import os
 import subprocess
 
-from setuptools import setup, find_packages as setuptools_find_packages
 
-
 #
 # Utilities
 #
@@ -33,7 +33,15 @@
         "twisted.plugins",
     ]
 
-    return modules + setuptools_find_packages()
+    for pkg in filter(
+        lambda p: os.path.isdir(p) and os.path.isfile(os.path.join(p, "__init__.py")),
+        os.listdir(".")
+    ):
+        modules.extend([
+            "{}.{}".format(pkg, subpkg)
+            for subpkg in setuptools_find_packages(pkg)
+        ])
+    return modules
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140807/554d747e/attachment.html>