mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-18 10:46:24 +00:00
setup: undo (for the second time) the use of the --multi-version feature
When this feature is turned on, then setuptools doesn't create easy-install.pth, setuptools.pth, or site.py in the target site-packages dir. I don't know why not and we should probably open a ticket on the setuptools tracker and/or hack setuptools to create those files anyway. But for now (for the Tahoe-1.3.0 release), we're going to leave --multi-version mode off and require users to manually uninstall any packages which are too old and thus conflict with our newer dependencies.
This commit is contained in:
parent
4771e1c9d5
commit
8148366d93
4
setup.py
4
setup.py
@ -165,7 +165,7 @@ if 'trial' in sys.argv[1:]:
|
||||
setup_requires.append('setuptools_trial >= 0.2')
|
||||
|
||||
# Whenever we run the 'trial' command, make sure that the build_tahoe step
|
||||
# is run as well to pass through the --multi-version flag.
|
||||
# is run as well.
|
||||
trial_index = sys.argv.index('trial')
|
||||
sys.argv.insert(trial_index, 'build_tahoe')
|
||||
|
||||
@ -297,7 +297,7 @@ class BuildTahoe(Command):
|
||||
f.write(line)
|
||||
f.close()
|
||||
|
||||
command = [sys.executable, "setup.py", "develop", "--multi-version",
|
||||
command = [sys.executable, "setup.py", "develop",
|
||||
"--prefix=support"]
|
||||
print "Command:", " ".join(command)
|
||||
rc = subprocess.call(command)
|
||||
|
Loading…
Reference in New Issue
Block a user