minor fixes at dependencies

Change-Id: Ic30ce0df9b837ac519784e3438611e1163d7e17e
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/MANIFEST.in b/MANIFEST.in
index 2c2a19e..2e06a57 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -21,4 +21,3 @@ recursive-include osm_nbi *.py *.sh *.cfg *.yml
 recursive-include osm_nbi/html_public *
 recursive-include osm_nbi/http *
 recursive-include devops-stages *
 recursive-include osm_nbi/html_public *
 recursive-include osm_nbi/http *
 recursive-include devops-stages *

-

diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
index 5f94ba3..71d2252 100755 (executable)
--- a/devops-stages/stage-test.sh
+++ b/devops-stages/stage-test.sh
@@ -13,6 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-tox -e flake8
-tox -e unittest
+tox  # flake8 unittest

 
 

diff --git a/requirements.txt b/requirements.txt
index 41bc5f6..99a136b 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,5 +17,4 @@ python-keystoneclient
 requests
 git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
 git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im
 requests
 git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
 git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im

-aiohttp==2.3.10
-
+aiohttp>=2.3.10

diff --git a/setup.py b/setup.py
index 7a4599a..67c1740 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -47,19 +47,15 @@ setup(
     # data_files=[('/etc/osm/', ['osm_nbi/nbi.cfg']),
     #             ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
     #             ],
     # data_files=[('/etc/osm/', ['osm_nbi/nbi.cfg']),
     #             ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
     #             ],

-    dependency_links=[
-        "git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im",
-        'git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common'
-    ],

     install_requires=[
         'CherryPy==18.1.2',
     install_requires=[
         'CherryPy==18.1.2',

-        'osm-common',
+        'osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common',

         'jsonschema',
         'PyYAML',
         'jsonschema',
         'PyYAML',

-        'osm-im',
+        'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',

         'python-keystoneclient',
         'requests',
         'python-keystoneclient',
         'requests',

-        'aiohttp',
+        'aiohttp>=2.3.10',

     ],
     setup_requires=['setuptools-version-command'],
 )
     ],
     setup_requires=['setuptools-version-command'],
 )