setup: add --multi-version to the "setup.py develop" command-line

fixes #530. I earlier tried this twice (see #530 for history) and then twice rolled it back due to some problems that arose. However, I didn't write down what the problems were in enough detail on the ticket that I can tell today whether those problems are still issues, so here goes the third attempt. (I did write down on the ticket that it would not create site.py or .pth files in the target directory with --multi-version mode, but I didn't explain why *that* was a problem.)

diff --git a/setup.cfg b/setup.cfg
index 41e20daff874a87b2c1e5bde860a2fe64149e905..a9ccb4beba4ff2f6eaea89ab1137368f6fd4a918 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ find_links=misc/dependencies tahoe-deps ../tahoe-deps
 # (See http://tahoe-lafs.org/trac/tahoe-lafs/ticket/142 .)
 
 [aliases]
-build = darcsver --count-all-patches develop --prefix=support make_executable build
+build = darcsver --count-all-patches develop --multi-version --prefix=support make_executable build
 test = darcsver --count-all-patches develop --prefix=support make_executable build trial
 sdist = darcsver --count-all-patches sdist
 install = darcsver --count-all-patches install

diff --git a/src/allmydata/scripts/keygen.py b/src/allmydata/scripts/keygen.py
index f96b3a7694960760949795e2df4ed4941b1a4a7b..c1d09786aa2a0e204328f01d496083bd146bbcfd 100644 (file)
--- a/src/allmydata/scripts/keygen.py
+++ b/src/allmydata/scripts/keygen.py
@@ -14,6 +14,9 @@ class CreateKeyGeneratorOptions(BasedirMixin, BaseOptions):
 keygen_tac = """
 # -*- python -*-
 
+import pkg_resources
+pkg_resources.require('allmydata-tahoe')
+
 from allmydata import key_generator
 from twisted.application import service