From: Brian Warner Date: Wed, 14 Mar 2012 06:13:51 +0000 (-0700) Subject: minor: hush pyflakes, move pycryptopp dep to unconditional section X-Git-Url: https://git.rkrishnan.org/simplejson/%22news.html/somewhere?a=commitdiff_plain;h=a133c087327107b3101be49287db19d2697d9a02;p=tahoe-lafs%2Ftahoe-lafs.git minor: hush pyflakes, move pycryptopp dep to unconditional section Also change Makefile's "pyflakes" rule to emit less output, so buildbot will count errors properly. --- diff --git a/Makefile b/Makefile index 4bf09d39..89532499 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ check-miscaptures: @echo pyflakes: - $(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq + @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq @echo check-umids: diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index 6f7d7cf5..ee9ad6f4 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -51,6 +51,9 @@ install_requires = [ # http://www.voidspace.org.uk/python/mock/ "mock", + # pycryptopp-0.6.0 includes ed25519 + "pycryptopp >= 0.6.0", + # Will be needed to test web apps, but not yet. See #1001. #"windmill >= 1.3", ] @@ -75,9 +78,7 @@ package_imports = [ ] def require_more(): - import platform, sys - # pycryptopp-0.6.0 includes ed25519 - install_requires.append("pycryptopp >= 0.6.0") + import sys # Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite" # distribution for Python 2.4.