From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 20:12:21 +0000 (+0100)
Subject: This change to setup.cfg appears to have been made by setuptools.
X-Git-Url: https://git.rkrishnan.org/simplejson/encoder.py.html?a=commitdiff_plain;h=refs%2Fheads%2Frel-1.9.2;p=tahoe-lafs%2Ftahoe-lafs.git

This change to setup.cfg appears to have been made by setuptools.
It is in the allmydata-tahoe-1.9.2 release tarballs but not the darcs tag.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/setup.cfg b/setup.cfg
index 0d682035..2a4ac58f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,41 +1,20 @@
 [easy_install]
-# Tahoe-LAFS actually does work at least as well as any package works when
-# zipped, but zipping eggs causes various problems
-# (http://bugs.python.org/setuptools/issue33 ), and generally makes it harder
-# for people to get at the source code, and doesn't actually provide any
-# benefits that I am aware of.
-zip_ok=False
+zip_ok = False
+find_links = misc/dependencies tahoe-deps ../tahoe-deps
+	https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/
+	https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-eggs/
 
-# Tahoe-LAFS depends upon several libraries (foolscap, twisted, pycryptopp,
-# zfec, and others). Left to its own devices, setuptools will look on PyPI for
-# these and will download them at build time. The 'find_links=' entry in
-# setup.cfg causes setuptools to look for these dependent tarballs in
-# tahoe-deps/ and ../tahoe-deps/ before it resorts to downloading them from
-# PyPI.
-
-# 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 darcs 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
-# dependencies in the tahoe-deps/ directory.
-
-find_links=misc/dependencies tahoe-deps ../tahoe-deps
- https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-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 ticket #142.)
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
 
 [aliases]
-build = update_version develop --prefix=support make_executable build
-test = update_version develop --prefix=support make_executable build trial
+sdist_dsc = update_version sdist_dsc
 sdist = update_version sdist
+trial = update_version trial
+build = update_version develop --prefix=support make_executable build
 install = update_version install
+test = update_version develop --prefix=support make_executable build trial
 bdist_egg = update_version bdist_egg
-trial = update_version trial
-sdist_dsc = update_version sdist_dsc
+