From: tierno Date: Tue, 28 Jan 2020 16:31:10 +0000 (+0000) Subject: fix dependencies at setup.py X-Git-Tag: v7.1.0rc1~1^2~26 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F8533%2F1;p=osm%2FRO.git fix dependencies at setup.py Change-Id: I338003728206b3934c07835e2f7a01a76ed1eda5 Signed-off-by: tierno --- diff --git a/RO-SDN-dynpac/requirements.txt b/RO-SDN-dynpac/requirements.txt index 44c797f2..a6f6d655 100644 --- a/RO-SDN-dynpac/requirements.txt +++ b/RO-SDN-dynpac/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 diff --git a/RO-SDN-dynpac/setup.py b/RO-SDN-dynpac/setup.py index 52a4fc82..af69a0dc 100644 --- a/RO-SDN-dynpac/setup.py +++ b/RO-SDN-dynpac/setup.py @@ -44,8 +44,10 @@ setup( 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_dynpac = osm_rosdn_dynpac.wimconn_dynpac:DynpacConnector'], diff --git a/RO-SDN-floodlight_openflow/setup.py b/RO-SDN-floodlight_openflow/setup.py index 93a19881..d5b9848c 100644 --- a/RO-SDN-floodlight_openflow/setup.py +++ b/RO-SDN-floodlight_openflow/setup.py @@ -44,8 +44,10 @@ setup( 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_floodlightof = osm_rosdn_floodlightof.sdnconn_floodlightof:' diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt index 44c797f2..a6f6d655 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 diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py index 333ee588..96e6b627 100644 --- a/RO-SDN-onos_openflow/setup.py +++ b/RO-SDN-onos_openflow/setup.py @@ -44,8 +44,10 @@ setup( 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'], diff --git a/RO-SDN-onos_openflow/tox.ini b/RO-SDN-onos_openflow/tox.ini index 00b45857..a9f86882 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 diff --git a/RO-SDN-onos_vpls/requirements.txt b/RO-SDN-onos_vpls/requirements.txt index 44c797f2..a6f6d655 100644 --- a/RO-SDN-onos_vpls/requirements.txt +++ b/RO-SDN-onos_vpls/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 diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py index 0785cb5b..b015e670 100644 --- a/RO-SDN-onos_vpls/setup.py +++ b/RO-SDN-onos_vpls/setup.py @@ -44,8 +44,10 @@ setup( 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_onos_vpls = osm_rosdn_onos_vpls.sdn_assist_onos_vpls:OnosVpls'], diff --git a/RO-SDN-tapi/requirements.txt b/RO-SDN-tapi/requirements.txt index 44c797f2..a6f6d655 100644 --- a/RO-SDN-tapi/requirements.txt +++ b/RO-SDN-tapi/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 diff --git a/RO-SDN-tapi/setup.py b/RO-SDN-tapi/setup.py index 931dd66c..9217492a 100644 --- a/RO-SDN-tapi/setup.py +++ b/RO-SDN-tapi/setup.py @@ -45,7 +45,10 @@ setup( 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_tapi = osm_rosdn_tapi.wimconn_ietfl2vpn:WimconnectorIETFL2VPN'], diff --git a/RO-VIM-aws/setup.py b/RO-VIM-aws/setup.py index 30b90bd3..b8f37039 100644 --- a/RO-VIM-aws/setup.py +++ b/RO-VIM-aws/setup.py @@ -44,9 +44,9 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], install_requires=[ - "requests", "netaddr", "PyYAML", "osm-ro", "boto" + "requests", "netaddr", "PyYAML", "boto", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-azure/setup.py b/RO-VIM-azure/setup.py index 557fedaf..32c204c6 100644 --- a/RO-VIM-azure/setup.py +++ b/RO-VIM-azure/setup.py @@ -44,8 +44,13 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], - install_requires=["requests", "netaddr", "PyYAML", "azure", "osm-ro"], + install_requires=[ + "requests", + "netaddr", + "PyYAML", + "azure", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" + ], setup_requires=['setuptools-version-command'], entry_points={ 'osm_rovim.plugins': ['rovim_azure = osm_rovim_azure.vimconn_azure'], diff --git a/RO-VIM-fos/setup.py b/RO-VIM-fos/setup.py index 95d97ca3..62cf4b82 100644 --- a/RO-VIM-fos/setup.py +++ b/RO-VIM-fos/setup.py @@ -44,9 +44,12 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], install_requires=[ - "requests", "netaddr", "PyYAML", "osm-ro", "fog05rest>=0.0.4" + "requests", + "netaddr", + "PyYAML", + "fog05rest>=0.0.4", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-opennebula/setup.py b/RO-VIM-opennebula/setup.py index c27bca3d..7819282a 100644 --- a/RO-VIM-opennebula/setup.py +++ b/RO-VIM-opennebula/setup.py @@ -45,8 +45,12 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], - install_requires=["requests", "netaddr", "PyYAML", "osm-ro",], + install_requires=[ + "requests", + "netaddr", + "PyYAML", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" + ], setup_requires=['setuptools-version-command'], entry_points={ 'osm_rovim.plugins': ['rovim_opennebula = osm_rovim_opennebula.vimconn_opennebula'], diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py index 1b3deba3..56c798b3 100644 --- a/RO-VIM-openstack/setup.py +++ b/RO-VIM-openstack/setup.py @@ -44,11 +44,11 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], install_requires=[ "python-openstackclient", "python-neutronclient", "requests", "netaddr", "PyYAML", - "osm-ro", # TODO py3 "networking-l2gw" + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" + # TODO py3 "networking-l2gw" # "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient", ], setup_requires=['setuptools-version-command'], diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py index 19ac0ba3..7a9070cc 100644 --- a/RO-VIM-openvim/setup.py +++ b/RO-VIM-openvim/setup.py @@ -44,9 +44,9 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], install_requires=[ "requests", "netaddr", "PyYAML", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-vmware/setup.py b/RO-VIM-vmware/setup.py index 193102ec..373cf813 100644 --- a/RO-VIM-vmware/setup.py +++ b/RO-VIM-vmware/setup.py @@ -45,11 +45,10 @@ setup( packages=[_name], include_package_data=True, - dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], install_requires=[ "pyvcloud==19.1.1", "progressbar", "prettytable", "pyvmomi", "requests", "netaddr", "PyYAML", - "osm-ro", + "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO/setup.py b/RO/setup.py index 5cb1fe90..a78a18bd 100755 --- a/RO/setup.py +++ b/RO/setup.py @@ -29,7 +29,7 @@ _license = 'Apache 2.0' _url = 'https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary' _requirements = [ # TODO py3 revise - "osm-im", + "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im", "PyYAML", "bottle", "logutils", @@ -67,7 +67,7 @@ setup( scripts=['osm_ro/scripts/RO-start.sh' #'openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report', ], - dependency_links=["git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im"], + # dependency_links=["git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm_im"], install_requires=_requirements, include_package_data=True, setup_requires=['setuptools-version-command'],