Merge pull request #236 from daira/2725.timezone-test.0

[tahoe-lafs/tahoe-lafs.git] / setup.cfg

diff --git a/setup.cfg b/setup.cfg
index 7232eb9acbd96a5a193a14edfcb30e511c2de068..ac312c9d2be7b434f2c8e25306efdc069348790a 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,28 +13,24 @@ zip_ok=False
 # tahoe-deps/ and ../tahoe-deps/ before it resorts to downloading them from
 # PyPI.
 
-# http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a
-# bundle of these dependencies (as Python source distributions or "sdists"). So
-# it you want to avoid the build-time download (say, if you're on an airplane,
-# or a desert island), just grab a copy and unpack it in your tahoe darcs tree.
+# https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a
+# bundle of these dependencies (as Python source distributions or "sdists").
+# So it you want to avoid the build-time download (say, if you're on an
+# airplane, or a desert island), just grab a copy and unpack it in your tahoe
+# source tree.
 
 # Alternatively, if you're building from a release/nightly tarball instead of
-# a darcs tree, the 'sumo' tarball variant will include all of these
+# a git tree, the 'sumo' tarball variant will include all of these
 # dependencies in the tahoe-deps/ directory.
 
 find_links=misc/dependencies tahoe-deps ../tahoe-deps
- http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/
- http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-eggs/
-
-# The following is a directory on the test grid which holds a bunch of packages
-# of dependencies.  It is commented-out because the test grid has gone away and
-# a new one -- the Volunteer Test Grid -- is not yet publicly usable.
-# http://testgrid.allmydata.org:3567/uri/URI%3ADIR2-RO%3Asnrfwfxatrci35zdgjnzxxx2ke%3Aunarxv347edtku3xzmefy4mcdmfngxzeb72iyqcadbjzjpczjx5a/index.html
+ https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-sdists/
+ https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-eggs/
 
 # Other sites that we might want to list:
 # http://sourceforge.net/project/showfiles.php?group_id=78018&package_id=79063
 # http://pypi.python.org/pypi/pywin32
-# (See http://tahoe-lafs.org/trac/tahoe-lafs/ticket/142 .)
+# (See ticket #142.)
 
 [aliases]
 build = update_version develop --prefix=support make_executable build
@@ -43,4 +39,3 @@ sdist = update_version sdist
 install = update_version install
 bdist_egg = update_version bdist_egg
 trial = update_version trial
-sdist_dsc = update_version sdist_dsc