commit 2346095e8f8d980c071592db4eac04fc3ff20699
author tierno <alfonso.tiernosepulveda@telefonica.com> Tue Jan 28 16:31:10 2020 +0000
committer tierno <alfonso.tiernosepulveda@telefonica.com> Wed Jan 29 14:31:01 2020 +0000
tree dcd90be5adf33a775521c57b2e21098d5ecc67de
parent 32a4190a32e45f7fa259d06efdc3de56570feb46

fix dependencies at setup.py

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

RO-SDN-onos_openflow/requirements.txt

diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt
index 44c797f..a6f6d65 100644
--- a/RO-SDN-onos_openflow/requirements.txt
+++ b/RO-SDN-onos_openflow/requirements.txt
@@ -14,5 +14,5 @@
 ##
 
 requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
 

RO-SDN-onos_openflow/setup.py

diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py
index 333ee58..96e6b62 100644
--- a/RO-SDN-onos_openflow/setup.py
+++ b/RO-SDN-onos_openflow/setup.py
@@ -44,8 +44,10 @@
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
-    install_requires=["requests", "osm-ro"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_onosof = osm_rosdn_onosof.sdnconn_onosof:SdnConnectorOnosOf'],

RO-SDN-onos_openflow/tox.ini

diff --git a/RO-SDN-onos_openflow/tox.ini b/RO-SDN-onos_openflow/tox.ini
index 00b4585..a9f8688 100644
--- a/RO-SDN-onos_openflow/tox.ini
+++ b/RO-SDN-onos_openflow/tox.ini
@@ -14,18 +14,20 @@
 ##
 
 [tox]
-envlist = py3
-toxworkdir={homedir}/.tox
+envlist = flake8
+toxworkdir={toxinidir}/.tox
 
 [testenv]
 basepython = python3
-install_command = python3 -m pip install -r requirements.txt -U {opts} {packages}
+install_command = python3 -m pip install -U {opts} {packages}
 # deps = -r{toxinidir}/test-requirements.txt
 commands=python3 -m unittest discover -v
 
 [testenv:flake8]
 basepython = python3
 deps = flake8
+       -r{toxinidir}/requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
 commands = flake8 osm_rosdn_onosof --max-line-length 120 \
     --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,E226,W504