mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 21:17:54 +00:00
src/allmydata/_auto_deps.py: setuptools is still an install requirement even in frozen builds, because .tac files import pkg_resources. refs #585
This commit is contained in:
parent
8587c63bdc
commit
c8ccb297fa
@ -5,6 +5,10 @@
|
|||||||
# always available, or the import is protected by try...except ImportError.
|
# always available, or the import is protected by try...except ImportError.
|
||||||
|
|
||||||
install_requires = [
|
install_requires = [
|
||||||
|
# we require newer versions of setuptools (actually
|
||||||
|
# zetuptoolz) to build, but can handle older versions to run
|
||||||
|
"setuptools >= 0.6c6",
|
||||||
|
|
||||||
"zfec >= 1.1.0",
|
"zfec >= 1.1.0",
|
||||||
|
|
||||||
# Feisty has simplejson 1.4
|
# Feisty has simplejson 1.4
|
||||||
@ -80,10 +84,11 @@ def require_more():
|
|||||||
install_requires.append("pysqlite >= 2.0.5")
|
install_requires.append("pysqlite >= 2.0.5")
|
||||||
package_imports.append(('pysqlite', 'pysqlite2.dbapi2'))
|
package_imports.append(('pysqlite', 'pysqlite2.dbapi2'))
|
||||||
|
|
||||||
|
# Don't try to get the version number of setuptools in frozen builds, because
|
||||||
|
# that triggers 'site' processing that causes failures. Note that frozen
|
||||||
|
# builds still (unfortunately) import pkg_resources in .tac files, so the
|
||||||
|
# entry for setuptools in install_requires above isn't conditional.
|
||||||
if not hasattr(sys, 'frozen'):
|
if not hasattr(sys, 'frozen'):
|
||||||
# we require newer versions of setuptools (actually
|
|
||||||
# zetuptoolz) to build, but can handle older versions to run
|
|
||||||
install_requires.append("setuptools >= 0.6c6")
|
|
||||||
package_imports.append(('setuptools', 'setuptools'))
|
package_imports.append(('setuptools', 'setuptools'))
|
||||||
|
|
||||||
require_more()
|
require_more()
|
||||||
|
Loading…
Reference in New Issue
Block a user