[CalendarServer-changes] [13847] CalDAVTester/trunk/setup.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 7 08:05:25 PDT 2014


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

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

Modified: CalDAVTester/trunk/setup.py
===================================================================
--- CalDAVTester/trunk/setup.py	2014-08-07 07:41:08 UTC (rev 13846)
+++ CalDAVTester/trunk/setup.py	2014-08-07 15:05:25 UTC (rev 13847)
@@ -18,23 +18,28 @@
 
 from __future__ import print_function
 
-from itertools import chain
-from os import listdir, environ as environment
 from os.path import dirname, abspath, join as joinpath
+from setuptools import setup, find_packages as setuptools_find_packages
 import errno
+import os
 import subprocess
 
-from pip.req import parse_requirements
-from setuptools import setup, find_packages as setuptools_find_packages
 
-
 #
 # Utilities
 #
 def find_packages():
     modules = []
 
-    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
 
 
 
@@ -99,6 +104,8 @@
 # Options
 #
 
+name = "CalDAVTester",
+
 description = "CalDAV/CardDAV protocol test suite"
 
 long_description = file(joinpath(dirname(__file__), "README.txt")).read()
@@ -115,40 +122,26 @@
     "Topic :: Software Development :: Testing",
 ]
 
+author = "Apple Inc."
 
-#
-# Dependencies
-#
+author_email = "calendarserver-dev at lists.macosforge.org"
 
-requirements_dir = joinpath(dirname(__file__), "requirements")
+license = "Apache License, Version 2.0"
 
+platforms = ["all"]
 
-def read_requirements(reqs_filename):
-    return [
-        str(r.req) for r in
-        parse_requirements(joinpath(requirements_dir, reqs_filename))
-    ]
 
+#
+# Dependencies
+#
 
 setup_requirements = []
 
-install_requirements = read_requirements("py_base.txt")
+install_requirements = []
 
-extras_requirements = dict(
-    (reqs_filename[4:-4], read_requirements(reqs_filename))
-    for reqs_filename in listdir(requirements_dir)
-    if reqs_filename.startswith("py_opt_") and reqs_filename.endswith(".txt")
-)
+extras_requirements = {}
 
-# Requirements for development and testing
-develop_requirements = read_requirements("py_develop.txt")
 
-if environment.get("_DEVELOP", "false") == "true":
-    install_requirements.extend(develop_requirements)
-    install_requirements.extend(chain(*extras_requirements.values()))
-
-
-
 #
 # Set up Extension modules that need to be built
 #
@@ -167,16 +160,16 @@
     version_string = version()
 
     setup(
-        name="CalDAVTester",
+        name=name,
         version=version_string,
         description=description,
         long_description=long_description,
         url=url,
         classifiers=classifiers,
-        author="Apple Inc.",
-        author_email="calendarserver-dev at lists.macosforge.org",
-        license="Apache License, Version 2.0",
-        platforms=["all"],
+        author=author,
+        author_email=author_email,
+        license=license,
+        platforms=platforms,
         packages=find_packages(),
         package_data={},
         scripts=[],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140807/c7a5c156/attachment-0001.html>


More information about the calendarserver-changes mailing list