diff --git a/Makefile b/Makefile index 4bf09d39a..895324991 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 6f7d7cf55..ee9ad6f4e 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.