From: Zooko O'Whielacronx Date: Mon, 6 Sep 2010 05:57:14 +0000 (-0700) Subject: setup: use execfile to access _auto_deps.py in its proper location of src/allmydata... X-Git-Tag: trac-4800~51 X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/%3C?a=commitdiff_plain;h=0c6bb0178bb3f8ff44af29259df7ead85d07e437;p=tahoe-lafs%2Ftahoe-lafs.git setup: use execfile to access _auto_deps.py in its proper location of src/allmydata/ instead of copying it into place when setup.py is executed --- diff --git a/Makefile b/Makefile index 723d656d..316c7d1f 100644 --- a/Makefile +++ b/Makefile @@ -243,10 +243,10 @@ test-darcs-boringfile: $(PYTHON) misc/build_helpers/test-darcs-boringfile.py test-clean: - find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|auto_deps|appname).py" |sort >allfiles.tmp.old + find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|appname).py" |sort >allfiles.tmp.old $(MAKE) $(MAKE) clean - find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|auto_deps|appname).py" |sort >allfiles.tmp.new + find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|appname).py" |sort >allfiles.tmp.new diff allfiles.tmp.old allfiles.tmp.new clean: diff --git a/_auto_deps.py b/_auto_deps.py deleted file mode 100644 index d5711450..00000000 --- a/_auto_deps.py +++ /dev/null @@ -1,113 +0,0 @@ -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", - - # Feisty has simplejson 1.4 - "simplejson >= 1.4", - - "zope.interface", - "Twisted >= 2.4.0", - - # foolscap < 0.5.1 had a performance bug which spent - # O(N**2) CPU for transferring large mutable files - # of size N. - "foolscap[secure_connections] >= 0.5.1", - "Nevow >= 0.6.0", - - # Needed for SFTP. pyasn1 is needed by twisted.conch in Twisted >= 9.0. - # pycrypto 2.2 doesn't work due to https://bugs.launchpad.net/pycrypto/+bug/620253 - "pycrypto == 2.0.1, == 2.1, >= 2.3", - "pyasn1 >= 0.0.8a", - - # Will be needed to test web apps, but not yet. See #1001. - #"windmill >= 1.3", - ] - -import platform -if platform.machine().lower() in ['i386', 'x86_64', 'amd64', '']: - # pycryptopp v0.5.20 fixes bugs in SHA-256 and AES on x86 or amd64 - # (from Crypto++ revisions 470, 471, 480, 492). The '' is there - # in case platform.machine is broken and this is actually an x86 - # or amd64 machine. - install_requires.append("pycryptopp >= 0.5.20") -else: - # pycryptopp v0.5.13 had a new bundled version of Crypto++ - # (v5.6.0) and a new bundled version of setuptools (although that - # shouldn't make any different to users of pycryptopp). - install_requires.append("pycryptopp >= 0.5.14") - - -# Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite" -# distribution for Python 2.4. -import sys -if sys.version_info < (2, 5): - # pysqlite v2.0.5 was shipped in Ubuntu 6.06 LTS "dapper" and Nexenta NCP 1. - install_requires.append("pysqlite >= 2.0.5") - -## The following block is commented-out because there is not currently a pywin32 package which -## can be easy_install'ed and also which actually makes "import win32api" succeed. -## See http://sourceforge.net/tracker/index.php?func=detail&aid=1799934&group_id=78018&atid=551954 -## Users have to manually install pywin32 on Windows before installing Tahoe. -##import platform -##if platform.system() == "Windows": -## # Twisted requires pywin32 if it is going to offer process management functionality, or if -## # it is going to offer iocp reactor. We currently require process management. It would be -## # better if Twisted would declare that it requires pywin32 if it is going to offer process -## # management. That is twisted ticket #3238 -- http://twistedmatrix.com/trac/ticket/3238 . -## # On the other hand, Tahoe also depends on pywin32 for getting free disk space statistics -## # (although that is not a hard requirement: if win32api can't be imported then we don't -## # rely on having the disk stats). -## install_requires.append('pywin32') - -if hasattr(sys, 'frozen'): # for py2exe - install_requires=[] - -def require_python_version(): - import sys, platform - - # we require 2.4.4 on non-UCS-2, non-Redhat builds to avoid - # we require 2.4.3 on non-UCS-2 Redhat, because 2.4.3 is common on Redhat-based distros and will have patched the above bug - # we require at least 2.4.2 in any case to avoid a bug in the base64 module: - if sys.maxunicode == 65535: - if sys.version_info < (2, 4, 2) or sys.version_info[0] > 2: - raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.2 or greater " - "for a UCS-2 build (but less than v3), not %r" % - (sys.version_info,)) - elif platform.platform().lower().find('redhat') >= 0: - if sys.version_info < (2, 4, 3) or sys.version_info[0] > 2: - raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.3 or greater " - "on Redhat-based distributions (but less than v3), not %r" % - (sys.version_info,)) - else: - if sys.version_info < (2, 4, 4) or sys.version_info[0] > 2: - raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.4 or greater " - "for a non-UCS-2 build (but less than v3), not %r" % - (sys.version_info,)) - -def require_auto_deps(): - """ - The purpose of this function is to raise a pkg_resources exception if any of the - requirements can't be imported. This is just to give earlier and more explicit error - messages, as opposed to waiting until the source code tries to import some module from one - of these packages and gets an ImportError. This function gets called from - src/allmydata/__init__.py . - """ - require_python_version() - - import pkg_resources - for requirement in install_requires: - try: - pkg_resources.require(requirement) - except pkg_resources.DistributionNotFound: - # there is no .egg-info present for this requirement, which - # either means that it isn't installed, or it is installed in a - # way that pkg_resources can't find it (but regular python - # might). There are several older Linux distributions which - # provide our dependencies just fine, but they don't ship - # .egg-info files. Note that if there *is* an .egg-info file, - # but it shows a too-old version, then we'll get a - # VersionConflict error instead of DistributionNotFound. - pass diff --git a/setup.py b/setup.py index 267c8c71..3959531b 100644 --- a/setup.py +++ b/setup.py @@ -48,11 +48,6 @@ from setuptools import find_packages, setup from setuptools.command import sdist from setuptools import Command -# Make the dependency-version-requirement, which is used by the Makefile at -# build-time, also available to the app at runtime: -shutil.copyfile("_auto_deps.py", - os.path.join("src", "allmydata", "_auto_deps.py")) - trove_classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -224,8 +219,9 @@ class CheckAutoDeps(Command): def finalize_options(self): pass def run(self): - import _auto_deps - _auto_deps.require_auto_deps() + adglobals = {} + execfile('src/allmydata/_auto_deps.py', adglobals) + adglobals['require_auto_deps']() class MakeExecutable(Command): @@ -326,7 +322,9 @@ class MySdist(sdist.sdist): # Tahoe's dependencies are managed by the find_links= entry in setup.cfg and # the _auto_deps.install_requires list, which is used in the call to setup() # below. -from _auto_deps import install_requires +adglobals = {} +execfile('src/allmydata/_auto_deps.py', adglobals) +install_requires = adglobals['install_requires'] APPNAME='allmydata-tahoe' APPNAMEFILE = os.path.join('src', 'allmydata', '_appname.py') diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py new file mode 100644 index 00000000..aa148e20 --- /dev/null +++ b/src/allmydata/_auto_deps.py @@ -0,0 +1,121 @@ +# Note: do not import any module from Tahoe-LAFS itself in this +# file. Also please avoid importing modules from other packages than +# the Python Standard Library if at all possible (exception: we rely +# on importing pkg_resources, which is provided by setuptools, +# zetuptoolz, distribute, and perhaps in the future distutils2, for +# the require_auto_deps() function.) + +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", + + # Feisty has simplejson 1.4 + "simplejson >= 1.4", + + "zope.interface", + "Twisted >= 2.4.0", + + # foolscap < 0.5.1 had a performance bug which spent + # O(N**2) CPU for transferring large mutable files + # of size N. + "foolscap[secure_connections] >= 0.5.1", + "Nevow >= 0.6.0", + + # Needed for SFTP. pyasn1 is needed by twisted.conch in Twisted >= 9.0. + # pycrypto 2.2 doesn't work due to https://bugs.launchpad.net/pycrypto/+bug/620253 + "pycrypto == 2.0.1, == 2.1, >= 2.3", + "pyasn1 >= 0.0.8a", + + # Will be needed to test web apps, but not yet. See #1001. + #"windmill >= 1.3", + ] + +import platform +if platform.machine().lower() in ['i386', 'x86_64', 'amd64', '']: + # pycryptopp v0.5.20 fixes bugs in SHA-256 and AES on x86 or amd64 + # (from Crypto++ revisions 470, 471, 480, 492). The '' is there + # in case platform.machine is broken and this is actually an x86 + # or amd64 machine. + install_requires.append("pycryptopp >= 0.5.20") +else: + # pycryptopp v0.5.13 had a new bundled version of Crypto++ + # (v5.6.0) and a new bundled version of setuptools (although that + # shouldn't make any different to users of pycryptopp). + install_requires.append("pycryptopp >= 0.5.14") + + +# Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite" +# distribution for Python 2.4. +import sys +if sys.version_info < (2, 5): + # pysqlite v2.0.5 was shipped in Ubuntu 6.06 LTS "dapper" and Nexenta NCP 1. + install_requires.append("pysqlite >= 2.0.5") + +## The following block is commented-out because there is not currently a pywin32 package which +## can be easy_install'ed and also which actually makes "import win32api" succeed. +## See http://sourceforge.net/tracker/index.php?func=detail&aid=1799934&group_id=78018&atid=551954 +## Users have to manually install pywin32 on Windows before installing Tahoe. +##import platform +##if platform.system() == "Windows": +## # Twisted requires pywin32 if it is going to offer process management functionality, or if +## # it is going to offer iocp reactor. We currently require process management. It would be +## # better if Twisted would declare that it requires pywin32 if it is going to offer process +## # management. That is twisted ticket #3238 -- http://twistedmatrix.com/trac/ticket/3238 . +## # On the other hand, Tahoe also depends on pywin32 for getting free disk space statistics +## # (although that is not a hard requirement: if win32api can't be imported then we don't +## # rely on having the disk stats). +## install_requires.append('pywin32') + +if hasattr(sys, 'frozen'): # for py2exe + install_requires=[] +del sys # clean up namespace + +def require_python_version(): + import sys, platform + + # we require 2.4.4 on non-UCS-2, non-Redhat builds to avoid + # we require 2.4.3 on non-UCS-2 Redhat, because 2.4.3 is common on Redhat-based distros and will have patched the above bug + # we require at least 2.4.2 in any case to avoid a bug in the base64 module: + if sys.maxunicode == 65535: + if sys.version_info < (2, 4, 2) or sys.version_info[0] > 2: + raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.2 or greater " + "for a UCS-2 build (but less than v3), not %r" % + (sys.version_info,)) + elif platform.platform().lower().find('redhat') >= 0: + if sys.version_info < (2, 4, 3) or sys.version_info[0] > 2: + raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.3 or greater " + "on Redhat-based distributions (but less than v3), not %r" % + (sys.version_info,)) + else: + if sys.version_info < (2, 4, 4) or sys.version_info[0] > 2: + raise NotImplementedError("Tahoe-LAFS current requires Python v2.4.4 or greater " + "for a non-UCS-2 build (but less than v3), not %r" % + (sys.version_info,)) + +def require_auto_deps(): + """ + The purpose of this function is to raise a pkg_resources exception if any of the + requirements can't be imported. This is just to give earlier and more explicit error + messages, as opposed to waiting until the source code tries to import some module from one + of these packages and gets an ImportError. This function gets called from + src/allmydata/__init__.py . + """ + require_python_version() + + import pkg_resources + for requirement in install_requires: + try: + pkg_resources.require(requirement) + except pkg_resources.DistributionNotFound: + # there is no .egg-info present for this requirement, which + # either means that it isn't installed, or it is installed in a + # way that pkg_resources can't find it (but regular python + # might). There are several older Linux distributions which + # provide our dependencies just fine, but they don't ship + # .egg-info files. Note that if there *is* an .egg-info file, + # but it shows a too-old version, then we'll get a + # VersionConflict error instead of DistributionNotFound. + pass