setup import bugfix

.gitignore

@@ -5,6 +5,7 @@
 .idea
 .project
 .pydevproject
+.pytest_cache
 __pycache__
 build/*
 dist/*

common_analysis_ip_and_uri_finder/__init__.py

-from .ip_and_uri_finder_analysis import CommonAnalysisIPAndURIFinder, IPFinder, URIFinder, system_version
-
-__version__ = system_version
+from .ip_and_uri_finder_analysis import CommonAnalysisIPAndURIFinder, IPFinder, URIFinder
+from .version import __version__
 
 __all__ = [
     'IPFinder',

common_analysis_ip_and_uri_finder/ip_and_uri_finder_analysis.py

-from common_analysis_base import AnalysisPluginFile
-from common_helper_files import get_dir_of_file
 import logging
 import os
 import socket
 from sys import exc_info
+
 import yara
+from common_analysis_base import AnalysisPluginFile
+from common_helper_files import get_dir_of_file
 
+from .version import __version__
 
 logger = logging.getLogger('CommonAnalysisIPAndURIFinder')
 logger.setLevel(logging.INFO)
 
 
-system_version = "0.4.2"
-
-
 class FinderBase:
     @staticmethod
     def get_strings_from_matches(matches):
@@ -118,7 +117,7 @@ class URIFinder(FinderBase):
 class CommonAnalysisIPAndURIFinder(AnalysisPluginFile):
 
     def __init__(self, yara_uri_rules=None, yara_ip_rules=None):
-        super(CommonAnalysisIPAndURIFinder, self).__init__(system_version)
+        super(CommonAnalysisIPAndURIFinder, self).__init__(__version__)
         self._set_rule_file_pathes(yara_uri_rules, yara_ip_rules)
         self._check_for_errors()
 

common_analysis_ip_and_uri_finder/version.py

+__version__ = '0.4.2'

setup.py

 from setuptools import setup
-from common_analysis_ip_and_uri_finder import __version__
+import sys
+
+NAME = 'common_analysis_ip_and_uri_finder'
+
+sys.path.append(NAME)
+from version import __version__
 
 
 setup(
-    name="common_analysis_ip_and_uri_finder",
+    name=NAME,
     version=__version__,
-    packages=['common_analysis_ip_and_uri_finder'],
-    package_dir={'common_analysis_ip_and_uri_finder': 'common_analysis_ip_and_uri_finder'},
-    package_data={'common_analysis_ip_and_uri_finder': ['yara_rules/*']},
+    packages=[NAME],
+    package_dir={NAME: NAME},
+    package_data={NAME: ['yara_rules/*']},
     install_requires=[
-        'common_analysis_base >= 0.1',
-        'common_helper_files >= 0.2',
+        'common_analysis_base @ git+https://github.com/mass-project/common_analysis_base.git',
+        'common_helper_files @ git+https://github.com/fkie-cad/common_helper_files.git',
         'yara-python >= 3.5'
     ],
     data_files=[('common_analysis_ip_and_uri_finder/yara_rules', [
         'common_analysis_ip_and_uri_finder/yara_rules/ip_rules.yara',
         'common_analysis_ip_and_uri_finder/yara_rules/uri_rules.yara',
     ])],
-    dependency_links=[
-        'https://github.com/mass-project/common_analysis_base/tarball/master#egg=common_analysis_base-0.1',
-        'https://github.com/fkie-cad/common_helper_files/tarball/master#egg=common_helper_files-0.2'
-    ],
-    description="Analysis module to find IPs und URIs",
-    author="Fraunhofer FKIE, University of Bonn Institute of Computer Science 4",
-    license="GPL-3.0"
+    description='Analysis module to find IPs und URIs',
+    author='Fraunhofer FKIE, University of Bonn Institute of Computer Science 4',
+    license='GPL-3.0'
 )