reverting some stuff now that distorm3 is fixed in pypi

SuperCowPowers · Jan 3, 2015 · 3d64570 · 3d64570
1 parent 2b42029
commit 3d64570
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,6 @@ services:
     - elasticsearch
     - neo4j
 before_install:
-#    - sudo apt-get install python-dev
-#    - sudo apt-get install g++
-#    - sudo apt-get install libssl0.9.8
     - sudo apt-get install libgeoip1
     - sudo apt-get install libpcap0.8
     - wget https://s3-us-west-2.amazonaws.com/workbench-data/packages/Bro-2.2-Linux-x86_64_flex.deb

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,7 +7,5 @@ include workbench/server/config.ini
 include workbench_apps/workbench_cli/config.ini
 include workbench/clients/config.ini
 include workbench/workers/peid_userdb.txt
-# recursive-include workbench/data *
-recursive-include packages *
 recursive-include workbench/workers/bro *
 recursive-include workbench/workers/yara *
diff --git a/packages/distorm3-3.tar.gz b/packages/distorm3-3.tar.gz
diff --git a/setup.py b/setup.py
@@ -31,7 +31,6 @@
     include_package_data=True,
     scripts=['workbench/server/workbench_server', 'workbench_apps/workbench_cli/workbench'],
     tests_require=['tox'],
-    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',

diff --git a/workbench/server/version.py b/workbench/server/version.py
@@ -1,3 +1,3 @@
 ''' Workbench Server Version '''
-__version_info__ = (0, 3, 5)  
+__version_info__ = (0, 3, 6)  
 __version__      = '.'.join(map(str, __version_info__))