[CalendarServer-changes] [13848] twext/trunk/setup.py

[source_changes at macosforge.org]

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

Modified Paths:
--------------
    twext/trunk/setup.py

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2014-08-07 15:05:25 UTC (rev 13847)
+++ twext/trunk/setup.py	2014-08-07 15:05:51 UTC (rev 13848)
@@ -18,11 +18,12 @@
 
 from __future__ import print_function
 
-import sys
+from os.path import dirname, abspath, join as joinpath
+from setuptools import setup, find_packages as setuptools_find_packages
 import errno
-from os.path import dirname, abspath, join as joinpath
+import os
 import subprocess
-from setuptools import setup, find_packages as setuptools_find_packages
+import sys
 
 
 
@@ -35,7 +36,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/2a591058/attachment.html>