Commit 3b65b8c0 by Peter Weidenbach

version propagation changed

parent 128ed9af
...@@ -2,3 +2,6 @@ __pycache__ ...@@ -2,3 +2,6 @@ __pycache__
.project .project
.pydevproject .pydevproject
*.pyc *.pyc
build/*
dist/*
*.egg-info/*
from .ip_and_uri_finder_analysis import CommonAnalysisIPAndURIFinder from .ip_and_uri_finder_analysis import CommonAnalysisIPAndURIFinder, IPFinder, URIFinder, system_version
from .ip_and_uri_finder_analysis import IPFinder
from .ip_and_uri_finder_analysis import URIFinder __version__ = system_version
__all__ = [ __all__ = [
'IPFinder', 'IPFinder',
'URIFinder', 'URIFinder',
'CommonAnalysisIPAndURIFinder', 'CommonAnalysisIPAndURIFinder',
'__version__'
] ]
analysis_class = CommonAnalysisIPAndURIFinder analysis_class = CommonAnalysisIPAndURIFinder
from common_analysis_base import AnalysisPluginFile from common_analysis_base import AnalysisPluginFile
from common_helper_files import get_directory_for_filename, get_version_string_from_git
import socket import socket
from sys import exit, exc_info from sys import exit, exc_info
import logging import logging
import pkg_resources
try: try:
import yara import yara
...@@ -15,10 +13,8 @@ except ImportError: ...@@ -15,10 +13,8 @@ except ImportError:
logger = logging.getLogger('CommonAnalysisIPAndURIFinder') logger = logging.getLogger('CommonAnalysisIPAndURIFinder')
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
try:
system_version = pkg_resources.get_distribution("common_analysis_ip_and_uri_finder").version system_version = "0.3"
except:
system_version = get_version_string_from_git(get_directory_for_filename(__file__))
class FinderBase: class FinderBase:
......
import os
import subprocess
from setuptools import setup, find_packages from setuptools import setup, find_packages
from common_analysis_ip_and_uri_finder import __version__
setup( setup(
name="common_analysis_ip_and_uri_finder", name="common_analysis_ip_and_uri_finder",
version=subprocess.check_output(['git', 'describe', '--always'], cwd=os.path.dirname(os.path.abspath(__file__))).strip().decode('utf-8'), version=__version__,
packages=find_packages(), packages=find_packages(),
install_requires=[ install_requires=[
'common_analysis_base', 'common_analysis_base',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment