From: agarwalat <atul.agarwal@altran.com>
Date: Thu, 12 Nov 2020 09:57:34 +0000 (+0000)
Subject: test commit
X-Git-Tag: release-v9.0-start~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c641daef86748252e5934763522f3cf0aa74d2ee;p=osm%2FMON.git

test commit

Change-Id: I12bb8b3c8d1fa63ab886c3c2fc2153ef6782caed
Signed-off-by: agarwalat <atul.agarwal@altran.com>
Signed-off-by: Subhankar Pal <subhankar.pal@aricent.com>
---

diff --git a/Dockerfile b/Dockerfile
index 9392d74..db227e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@
 #__author__ = "Prithiv Mohan"
 #__date__   = "25/Sep/2017"
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN  apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get --yes install git tox make python-all python3 python3-pip debhelper wget && \
   DEBIAN_FRONTEND=noninteractive apt-get --yes install libmysqlclient-dev libxml2 python3-all libssl-dev && \
diff --git a/debian/python3-osm-mon.postinst b/debian/python3-osm-mon.postinst
index f7bc53b..88ccf3b 100644
--- a/debian/python3-osm-mon.postinst
+++ b/debian/python3-osm-mon.postinst
@@ -26,14 +26,14 @@ echo "Installing python dependencies via pip..."
 pip3 install aiokafka==0.6.0
 pip3 install requests==2.18.*
 pip3 install python-keystoneclient==3.15.*
-pip3 install six==1.11.*
+pip3 install six
 pip3 install peewee==3.8.*
 pip3 install pyyaml>=5.1.2
 pip3 install prometheus_client==0.4.*
 pip3 install gnocchiclient==7.0.*
 pip3 install pyvcloud==19.1.1
 pip3 install python-ceilometerclient==2.9.*
-pip3 install peewee-migrate==1.1.*
+# pip3 install peewee-migrate==1.1.*
 pip3 install python-novaclient==12.0.*
 pip3 install pymysql==0.9.*
 pip3 install python-neutronclient==5.1.*
diff --git a/requirements.txt b/requirements.txt
index d4eb273..36800ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@
 aiokafka==0.6.0
 requests==2.18.*
 python-keystoneclient==3.15.*
-six==1.11.*
+six
 peewee==3.8.*
 pyyaml>=5.1.2
 prometheus_client==0.4.*
@@ -29,7 +29,7 @@ gnocchiclient==7.0.*
 pymysql==0.9.*
 pyvcloud==19.1.*
 python-ceilometerclient==2.9.*
-peewee-migrate==1.1.*
+# peewee-migrate==1.1.*
 python-novaclient==12.0.*
 python-neutronclient==5.1.*
 git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
diff --git a/setup.py b/setup.py
index 3eeb9e5..2c40bd6 100644
--- a/setup.py
+++ b/setup.py
@@ -54,14 +54,14 @@ setup(
         "aiokafka==0.6.0",
         "requests==2.18.*",
         "python-keystoneclient==3.15.*",
-        "six==1.11.*",
+        "six",
         "peewee==3.8.*",
         "pyyaml>=5.1.2",
         "prometheus_client==0.4.*",
         "gnocchiclient==7.0.*",
         "pyvcloud==19.1.1",
         "python-ceilometerclient==2.9.*",
-        "peewee-migrate==1.1.*",
+     #   "peewee-migrate==1.1.*",
         "python-novaclient==12.0.*",
         "pymysql==0.9.*",
         "python-neutronclient==5.1.*",