setup.py: minor reformatting, use explicit file: URLs in dependency-links

diff --git a/setup.py b/setup.py
index f0d49ebcbe209f0c73c3bccc368f38b7647e52ad..179fb41af828dccd1baaee9d1af690c1ab1b22cb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -85,13 +85,16 @@ participating nodes, using an algorithm that can recover the data even if a
 majority of the nodes are no longer available."""
 
 
-# This form is used when the unpacked source distribution is copied into our tree:
-#"file:misc/dependencies/zfec-1.0.2/"
+# This form is used when the unpacked source distribution is copied into our
+# tree:
+#  "file:misc/dependencies/zfec-1.0.2/"
 # and this form is used when we provide a tarball
-# "file:misc/dependencies/zfec-1.0.2.tar.gz",
+#  "file:misc/dependencies/zfec-1.0.2.tar.gz",
 # The file: URL can start with either 'misc' or './misc' to get a relative path.
 
-dependency_tarballs=[ os.path.join("misc", "dependencies", fn) for fn in os.listdir(os.path.join("misc", "dependencies")) if fn.endswith(".tar.gz") ]
+dependency_tarballs=[ "file:" + os.path.join("misc", "dependencies", fn)
+                      for fn in os.listdir(os.path.join("misc", "dependencies"))
+                      if fn.endswith(".tar.gz") ]
 
 dependency_links=["http://allmydata.org/trac/tahoe/wiki/Dependencies"] + dependency_tarballs
 
@@ -115,7 +118,8 @@ setup(name='allmydata-tahoe',
       classifiers=trove_classifiers,
       test_suite="allmydata.test",
       install_requires=["zfec >= 1.0.3",
-                        "foolscap >= 0.1.6", "simplejson >= 1.4",
+                        "foolscap >= 0.1.6",
+                        "simplejson >= 1.4",
                         #"nevow", # we need nevow, but it doesn't seem to be
                                   # installable by easy_install
                         ],