[CalendarServer-changes] [13852] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13852
          http://trac.calendarserver.org//changeset/13852
Author:   cdaboo at apple.com
Date:     2014-08-07 09:56:00 -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 16:55:19 UTC (rev 13851)
+++ CalendarServer/trunk/requirements-dev.txt	2014-08-07 16:56:00 UTC (rev 13852)
@@ -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@13847#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13850#egg=CalDAVTester

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-08-07 16:55:19 UTC (rev 13851)
+++ CalendarServer/trunk/requirements-stable.txt	2014-08-07 16:56:00 UTC (rev 13852)
@@ -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@13848#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13851#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 16:55:19 UTC (rev 13851)
+++ CalendarServer/trunk/setup.py	2014-08-07 16:56:00 UTC (rev 13852)
@@ -37,7 +37,7 @@
         lambda p: os.path.isdir(p) and os.path.isfile(os.path.join(p, "__init__.py")),
         os.listdir(".")
     ):
-        modules.extend([
+        modules.extend([pkg, ] + [
             "{}.{}".format(pkg, subpkg)
             for subpkg in setuptools_find_packages(pkg)
         ])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140807/a2d0f7f2/attachment.html>