Merge pull request #5 from fkie-cad/github-action

added github action

.github/workflows/run_tests.yml

+name: Run Tests
+
+on: [pull_request]
+
+jobs:
+  tests:
+    strategy:
+      matrix:
+        python-version: [3.6, 3.9]
+        os: [ubuntu-18.04, ubuntu-20.04]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: install deps
+        run: |
+          python3 -m pip install -U pip
+          python3 -m pip install --editable .[dev]
+      - name: install yara
+        run: sudo apt-get install yara
+      - name: run pytest
+        run: pytest

.gitignore

-__pycache__
+*.egg-info/*
+*.pyc
+.cache
+.coverage
+.idea
 .project
 .pydevproject
-*.pyc
+.pytest_cache
+__pycache__
 build/*
 dist/*
-*.egg-info/*
-.cache

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.1"
-
-
 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'

pytest.ini

 [pytest]
-addopts = --pep8 -v
-pep8ignore = 
-    *.py E501
+addopts = --pycodestyle --cov=./ -v

setup.cfg

+[pycodestyle]
+ignore = E501,W503
+select = E504

setup.py

 from setuptools import setup
-from common_analysis_ip_and_uri_finder import __version__
+import sys
+
+NAME = 'common_analysis_ip_and_uri_finder'
+
+
+def _get_version():
+    sys.path.append(NAME)
+    from version import __version__
+    return __version__
 
 
 setup(
-    name="common_analysis_ip_and_uri_finder",
-    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/*']},
+    name=NAME,
+    version=_get_version(),
+    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'
     ],
+    extras_require={
+        'dev': [
+            'pytest',
+            'pytest-pycodestyle',
+            'pytest-cov'
+        ]
+    },
     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'
 )