trying to fix yet another issue with rekall, the distorm3 module need…

…s --pre and the 2.7.9 version of pip doesn't know about tthat :)
SuperCowPowers · Dec 31, 2014 · df0e4e3 · df0e4e3
1 parent c195fac
commit df0e4e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -17,7 +17,7 @@
 
 import mock
 
-MOCK_MODULES = ['coverage', 'cython', 'distorm3>=0', 'elasticsearch',
+MOCK_MODULES = ['coverage', 'cython', 'distorm3', 'elasticsearch',
                 'funcsigs', 'filemagic', 'pefile', 'peutils', 'py2neo',
                 'pymongo', 'pytest-cov', 'rekall', 'rekall.plugins',
                 'rekall.plugins.addrspaces', 'rekall.plugins.renderers.data_export',

diff --git a/setup.py b/setup.py
@@ -35,8 +35,9 @@
     include_package_data=True,
     scripts=['workbench/server/workbench_server', 'workbench_apps/workbench_cli/workbench'],
     tests_require=['tox'],
-    install_requires=['cython', 'elasticsearch', 'funcsigs', 'flask', 'filemagic', 
-                      'ipython', 'lz4', 'mock', 'pandas', 'pefile',
+    dependency_links=['packages/distorm3-3.tar.gz'],
+    install_requires=['cython', 'distorm3', 'elasticsearch', 'funcsigs', 'flask', 'filemagic', 
+                      'ipython', 'lz4', 'mock', 'numpy', 'pandas', 'pefile',
                       'py2neo==1.6.4', 'pymongo', 'pytest', 'rekall==1.0.3', 'requests',
                       'ssdeep==2.9-0.3', 'urllib3', 'yara', 'zerorpc', 'cython'],
     license='MIT',

diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/workbench
 deps =
     git+https://github.com/nedbat/coveragepy.git
+    packages/distorm3-3.tar.gz
     pytest
     pytest-cov==1.8.0
     gevent