commit 4454d2e3234efc63b5dc6f3bf2cdd949db21e929
author lavado <glavado@whitestack.com> Tue Sep 11 18:12:24 2018 +0200
committer Gerrit Code Review <root@osm.etsi.org> Tue Sep 11 18:12:24 2018 +0200
tree f3e06cbb89b33b129249e5f8db912ae56b34e58d
parent ac3083b1174246d7aa29ef7dcf057f68e1639324
parent e2598397eb54f1594aa5b8f05b4a6c5fa03edada

Merge "Adds osm-common dependency"

policy_module/Dockerfile

diff --git a/policy_module/Dockerfile b/policy_module/Dockerfile
index 6e93b30..553ed7b 100644
--- a/policy_module/Dockerfile
+++ b/policy_module/Dockerfile
@@ -25,7 +25,7 @@
 LABEL authors="Benjamín Díaz"
 
 RUN apt-get --yes update \
- && apt-get --yes install python3 python3-pip libmysqlclient-dev \
+ && apt-get --yes install python3 python3-pip libmysqlclient-dev git \
  && pip3 install pip==9.0.3
 
 COPY requirements.txt /policy_module/requirements.txt

policy_module/requirements.txt

diff --git a/policy_module/requirements.txt b/policy_module/requirements.txt
index e387896..ad2c105 100644
--- a/policy_module/requirements.txt
+++ b/policy_module/requirements.txt
@@ -3,4 +3,5 @@
 jsonschema==2.6.*
 six==1.11.*
 pyyaml==3.*
-python-logstash==0.4.*
\ No newline at end of file
+python-logstash==0.4.*
+git+https://osm.etsi.org/gerrit/osm/common.git@v4.0.1#egg=osm-common
\ No newline at end of file

policy_module/setup.py

diff --git a/policy_module/setup.py b/policy_module/setup.py
index afb6bf2..d5c3562 100644
--- a/policy_module/setup.py
+++ b/policy_module/setup.py
@@ -26,7 +26,7 @@
 
 def parse_requirements(requirements):
     with open(requirements) as f:
-        return [l.strip('\n') for l in f if l.strip('\n') and not l.startswith('#')]
+        return [l.strip('\n') for l in f if l.strip('\n') and not l.startswith('#') and '://' not in l]
 
 
 _author = "Benjamín Díaz"
@@ -52,10 +52,21 @@
     license=_license,
     packages=setuptools.find_packages(),
     include_package_data=True,
-    install_requires=parse_requirements('requirements.txt'),
+    install_requires=[
+        'kafka==1.3.*',
+        'peewee==3.1.*',
+        'jsonschema==2.6.*',
+        'six==1.11.*',
+        'pyyaml==3.*',
+        'python-logstash==0.4.*',
+        'osm-common==4.*'
+    ],
     entry_points={
         "console_scripts": [
             "osm-policy-agent = osm_policy_module.cmd.policy_module_agent:main",
         ]
-    }
+    },
+    dependency_links=[
+        'git+https://osm.etsi.org/gerrit/osm/common.git@v4.0.1#egg=osm-common'
+    ]
 )