<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13847] CalDAVTester/trunk/setup.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13847">13847</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 08:05:25 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix setup.py to work with newer setuptools.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksetuppy">CalDAVTester/trunk/setup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/setup.py (13846 => 13847)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -18,23 +18,28 @@
</span><span class="cx">
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><del>-from itertools import chain
-from os import listdir, environ as environment
</del><span class="cx"> from os.path import dirname, abspath, join as joinpath
</span><ins>+from setuptools import setup, find_packages as setuptools_find_packages
</ins><span class="cx"> import errno
</span><ins>+import os
</ins><span class="cx"> import subprocess
</span><span class="cx">
</span><del>-from pip.req import parse_requirements
-from setuptools import setup, find_packages as setuptools_find_packages
</del><span class="cx">
</span><del>-
</del><span class="cx"> #
</span><span class="cx"> # Utilities
</span><span class="cx"> #
</span><span class="cx"> def find_packages():
</span><span class="cx"> modules = []
</span><span class="cx">
</span><del>- return modules + setuptools_find_packages()
</del><ins>+ 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
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -99,6 +104,8 @@
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+name = "CalDAVTester",
+
</ins><span class="cx"> description = "CalDAV/CardDAV protocol test suite"
</span><span class="cx">
</span><span class="cx"> long_description = file(joinpath(dirname(__file__), "README.txt")).read()
</span><span class="lines">@@ -115,40 +122,26 @@
</span><span class="cx"> "Topic :: Software Development :: Testing",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+author = "Apple Inc."
</ins><span class="cx">
</span><del>-#
-# Dependencies
-#
</del><ins>+author_email = "calendarserver-dev@lists.macosforge.org"
</ins><span class="cx">
</span><del>-requirements_dir = joinpath(dirname(__file__), "requirements")
</del><ins>+license = "Apache License, Version 2.0"
</ins><span class="cx">
</span><ins>+platforms = ["all"]
</ins><span class="cx">
</span><del>-def read_requirements(reqs_filename):
- return [
- str(r.req) for r in
- parse_requirements(joinpath(requirements_dir, reqs_filename))
- ]
</del><span class="cx">
</span><ins>+#
+# Dependencies
+#
</ins><span class="cx">
</span><span class="cx"> setup_requirements = []
</span><span class="cx">
</span><del>-install_requirements = read_requirements("py_base.txt")
</del><ins>+install_requirements = []
</ins><span class="cx">
</span><del>-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")
-)
</del><ins>+extras_requirements = {}
</ins><span class="cx">
</span><del>-# Requirements for development and testing
-develop_requirements = read_requirements("py_develop.txt")
</del><span class="cx">
</span><del>-if environment.get("_DEVELOP", "false") == "true":
- install_requirements.extend(develop_requirements)
- install_requirements.extend(chain(*extras_requirements.values()))
-
-
-
</del><span class="cx"> #
</span><span class="cx"> # Set up Extension modules that need to be built
</span><span class="cx"> #
</span><span class="lines">@@ -167,16 +160,16 @@
</span><span class="cx"> version_string = version()
</span><span class="cx">
</span><span class="cx"> setup(
</span><del>- name="CalDAVTester",
</del><ins>+ name=name,
</ins><span class="cx"> version=version_string,
</span><span class="cx"> description=description,
</span><span class="cx"> long_description=long_description,
</span><span class="cx"> url=url,
</span><span class="cx"> classifiers=classifiers,
</span><del>- author="Apple Inc.",
- author_email="calendarserver-dev@lists.macosforge.org",
- license="Apache License, Version 2.0",
- platforms=["all"],
</del><ins>+ author=author,
+ author_email=author_email,
+ license=license,
+ platforms=platforms,
</ins><span class="cx"> packages=find_packages(),
</span><span class="cx"> package_data={},
</span><span class="cx"> scripts=[],
</span></span></pre>
</div>
</div>
</body>
</html>