X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tox.ini;h=42dfdc47c80b12a7b0ec9215aa979ee9731d353c;hb=6a6e3344cc0d68064a592941e33cdc6629eb3405;hp=5fd2a10bff24ce00804e1f968a9e15d1a30aa869;hpb=9ca53b609edcc8431a9d469a26a67a77e4fbf903;p=osm%2FRO.git diff --git a/tox.ini b/tox.ini index 5fd2a10b..42dfdc47 100644 --- a/tox.ini +++ b/tox.ini @@ -16,10 +16,11 @@ ####################################################################################### [tox] -envlist = black, flake8, safety +envlist = black, cover, flake8, pylint, safety [tox:jenkins] toxworkdir = /tmp/.tox +setenv = XDG_CACHE_HOME=/tmp/.cache [testenv] usedevelop = True @@ -34,8 +35,10 @@ parallel_show_output = true [testenv:release_notes] deps = reno skip_install = true +whitelist_externals = bash commands = reno new {posargs:new_feature} + bash -c "sed -i -e '1 e head -16 tox.ini' releasenotes/notes/{posargs:new_feature}*.yaml" ####################################################################################### @@ -56,8 +59,6 @@ commands = black --check --diff RO-SDN-onos_vpls black --check --diff RO-VIM-aws black --check --diff RO-VIM-azure - black --check --diff RO-VIM-fos - # black --check --diff RO-VIM-opennebula black --check --diff RO-VIM-openstack black --check --diff RO-VIM-openvim black --check --diff RO-VIM-vmware @@ -79,61 +80,56 @@ commands = nose2 -C --coverage NG-RO/osm_ng_ro -s NG-RO/osm_ng_ro sh -c 'mv .coverage .coverage_ng_ro' # RO-plugin - nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin - sh -c 'mv .coverage .coverage_ro_plugin' + # nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin + # sh -c 'mv .coverage .coverage_ro_plugin' # RO-SDN-arista_cloudvision - nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision - sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision' + # nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision + # sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision' # RO-SDN-dpb - nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb - sh -c 'mv .coverage .coverage_rosdn_dpb' + # nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb + # sh -c 'mv .coverage .coverage_rosdn_dpb' # RO-SDN-dynpac - nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac - sh -c 'mv .coverage .coverage_rosdn_dynpac' + # nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac + # sh -c 'mv .coverage .coverage_rosdn_dynpac' # RO-SDN-floodlight_openflow - nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof - sh -c 'mv .coverage .coverage_rosdn_floodlightof' + # nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof + # sh -c 'mv .coverage .coverage_rosdn_floodlightof' # RO-SDN-ietfl2vpn - nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn - sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn' + # nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn + # sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn' # RO-SDN-juniper_contrail nose2 -C --coverage RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail -s RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail sh -c 'mv .coverage .coverage_rosdn_juniper_contrail' # RO-SDN-odl_openflow - nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof - sh -c 'mv .coverage .coverage_rosdn_odlof' + # nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof + # sh -c 'mv .coverage .coverage_rosdn_odlof' # RO-SDN-onos_openflow - nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof - sh -c 'mv .coverage .coverage_rosdn_onosof' + # nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof + # sh -c 'mv .coverage .coverage_rosdn_onosof' # RO-SDN-onos_vpls - nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls - sh -c 'mv .coverage .coverage_rosdn_onos_vpls' + # nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls + # sh -c 'mv .coverage .coverage_rosdn_onos_vpls' # RO-VIM-aws - nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws - sh -c 'mv .coverage .coverage_rovim_aws' + # nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws + # sh -c 'mv .coverage .coverage_rovim_aws' # RO-VIM-azure - nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s RO-VIM-azure/osm_rovim_azure - sh -c 'mv .coverage .coverage_rovim_azure' - # RO-VIM-fos - nose2 -C --coverage RO-VIM-fos/osm_rovim_fos -s RO-VIM-fos/osm_rovim_fos - sh -c 'mv .coverage .coverage_rovim_fos' - # RO-VIM-opennebula - # nose2 -C --coverage RO-VIM-opennebula/osm_rovim_opennebula -s RO-VIM-opennebula/osm_rovim_opennebula - # sh -c 'mv .coverage .coverage_rovim_opennebula' + # nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s RO-VIM-azure/osm_rovim_azure + # sh -c 'mv .coverage .coverage_rovim_azure' # RO-VIM-openstack - # nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack - # sh -c 'mv .coverage .coverage_rovim_openstack' + nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack + sh -c 'mv .coverage .coverage_rovim_openstack' # RO-VIM-openvim - nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim - sh -c 'mv .coverage .coverage_rovim_openvim' + # nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim + # sh -c 'mv .coverage .coverage_rovim_openvim' # RO-VIM-vmware # nose2 -C --coverage RO-VIM-vmware/osm_rovim_vmware -s RO-VIM-vmware/osm_rovim_vmware # sh -c 'mv .coverage .coverage_rovim_vmware' # RO-VIM-gcp - nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s RO-VIM-gcp/osm_rovim_gcp - sh -c 'mv .coverage .coverage_rovim_gcp' + # nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s RO-VIM-gcp/osm_rovim_gcp + # sh -c 'mv .coverage .coverage_rovim_gcp' # Combine results and generate reports - coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_fos .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware .coverage_rovim_opennebula + # coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware + coverage combine .coverage_ng_ro .coverage_rovim_openstack .coverage_rosdn_juniper_contrail coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' coverage xml -o coverage.xml --omit='*tests*' @@ -141,29 +137,29 @@ commands = ####################################################################################### [testenv:flake8] -deps = flake8 +deps = + flake8==5.0.4 + flake8-import-order skip_install = true commands = - - flake8 NG-RO/osm_ng_ro/ NG-RO/setup.py - - flake8 RO-plugin/osm_ro_plugin/ RO-plugin/setup.py - - flake8 RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/ RO-SDN-arista_cloudvision/setup.py - - flake8 RO-SDN-dpb/osm_rosdn_dpb/ RO-SDN-dpb/setup.py - - flake8 RO-SDN-dynpac/osm_rosdn_dynpac/ RO-SDN-dynpac/setup.py - - flake8 RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/ RO-SDN-floodlight_openflow/setup.py - - flake8 RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/ RO-SDN-ietfl2vpn/setup.py - - flake8 RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/ RO-SDN-juniper_contrail/setup.py - - flake8 RO-SDN-odl_openflow/osm_rosdn_odlof/ RO-SDN-odl_openflow/setup.py - - flake8 RO-SDN-onos_openflow/osm_rosdn_onosof/ RO-SDN-onos_openflow/setup.py - - flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py - - flake8 RO-VIM-aws/osm_rovim_aws/ RO-VIM-aws/setup.py - - flake8 RO-VIM-azure/osm_rovim_azure/ RO-VIM-azure/setup.py - - flake8 RO-VIM-fos/osm_rovim_fos/ RO-VIM-fos/setup.py - # - flake8 RO-VIM-opennebula/osm_rovim_opennebula/ RO-VIM-opennebula/setup.py - - flake8 RO-VIM-openstack/osm_rovim_openstack/ RO-VIM-openstack/setup.py - - flake8 RO-VIM-openvim/osm_rovim_openvim/ RO-VIM-openvim/setup.py - - flake8 RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py RO-VIM-vmware/setup.py - - flake8 RO-VIM-gcp/osm_rovim_gcp/ RO-VIM-gcp/setup.py - - flake8 integration-tests/ + flake8 NG-RO/osm_ng_ro/ NG-RO/setup.py + flake8 RO-plugin/osm_ro_plugin/ RO-plugin/setup.py + flake8 RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/ RO-SDN-arista_cloudvision/setup.py + flake8 RO-SDN-dpb/osm_rosdn_dpb/ RO-SDN-dpb/setup.py + flake8 RO-SDN-dynpac/osm_rosdn_dynpac/ RO-SDN-dynpac/setup.py + flake8 RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/ RO-SDN-floodlight_openflow/setup.py + flake8 RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/ RO-SDN-ietfl2vpn/setup.py + flake8 RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/ RO-SDN-juniper_contrail/setup.py + flake8 RO-SDN-odl_openflow/osm_rosdn_odlof/ RO-SDN-odl_openflow/setup.py + flake8 RO-SDN-onos_openflow/osm_rosdn_onosof/ RO-SDN-onos_openflow/setup.py + flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py + flake8 RO-VIM-aws/osm_rovim_aws/ RO-VIM-aws/setup.py + flake8 RO-VIM-azure/osm_rovim_azure/ RO-VIM-azure/setup.py + flake8 RO-VIM-openstack/osm_rovim_openstack/ RO-VIM-openstack/setup.py + flake8 RO-VIM-openvim/osm_rovim_openvim/ RO-VIM-openvim/setup.py + flake8 RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py RO-VIM-vmware/setup.py + flake8 RO-VIM-gcp/osm_rovim_gcp/ RO-VIM-gcp/setup.py + flake8 integration-tests/ ####################################################################################### @@ -174,25 +170,23 @@ deps = {[testenv]deps} pylint skip_install = true commands = - - pylint -E NG-RO/osm_ng_ro - - pylint -E RO-plugin/osm_ro_plugin - - pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision - - pylint -E RO-SDN-dpb/osm_rosdn_dpb - - pylint -E RO-SDN-dynpac/osm_rosdn_dynpac - - pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof - - pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn - - pylint -E RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail - - pylint -E RO-SDN-odl_openflow/osm_rosdn_odlof - - pylint -E RO-SDN-onos_openflow/osm_rosdn_onosof - - pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls - - pylint -E RO-VIM-aws/osm_rovim_aws - - pylint -E RO-VIM-azure/osm_rovim_azure - - pylint -E RO-VIM-fos/osm_rovim_fos - # - pylint -E RO-VIM-opennebula/osm_rovim_opennebula - - pylint -E RO-VIM-openstack/osm_rovim_openstack - - pylint -E RO-VIM-openvim/osm_rovim_openvim - - pylint -E RO-VIM-vmware/osm_rovim_vmware - - pylint -E RO-VIM-gcp/osm_rovim_gcp + pylint -E NG-RO/osm_ng_ro --disable=E1101 + pylint -E RO-plugin/osm_ro_plugin --disable=E1101 + pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision --disable=all + pylint -E RO-SDN-dpb/osm_rosdn_dpb + pylint -E RO-SDN-dynpac/osm_rosdn_dynpac --disable=E1101 + pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof + pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn --disable=E1101 + pylint -E RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail + pylint -E RO-SDN-odl_openflow/osm_rosdn_odlof + pylint -E RO-SDN-onos_openflow/osm_rosdn_onosof + pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls --disable=E1101 + pylint -E RO-VIM-aws/osm_rovim_aws + pylint -E RO-VIM-azure/osm_rovim_azure --disable=all + pylint -E RO-VIM-openstack/osm_rovim_openstack --disable=E1101 + pylint -E RO-VIM-openvim/osm_rovim_openvim --disable=all + pylint -E RO-VIM-vmware/osm_rovim_vmware --disable=all + pylint -E RO-VIM-gcp/osm_rovim_gcp --disable=E1101 ####################################################################################### @@ -209,14 +203,19 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==5.5.0 +deps = pip-tools==6.6.2 skip_install = true -whitelist_externals = sh +whitelist_externals = bash + [ commands = - - sh -c "for file in requirements*.in ; do pip-compile -rU --no-header $file ;\ + - bash -c "for file in requirements*.in ; do \ + UNSAFE="" ; \ + if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \ + pip-compile -rU --no-header $UNSAFE $file ;\ out=`echo $file | sed 's/.in/.txt/'` ; \ sed -i -e '1 e head -16 tox.ini' $out ;\ done" + - bash -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt" ####################################################################################### @@ -389,32 +388,6 @@ commands = sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us' -####################################################################################### -[testenv:dist_ro_vim_fos] -deps = {[testenv]deps} - -r{toxinidir}/requirements-dist.txt -skip_install = true -whitelist_externals = sh -changedir = {toxinidir}/RO-VIM-fos -commands = - sh -c 'rm -rf deb_dist dist osm_rovim_fos.egg-info osm_rovim_fos*.tar.gz' - python3 setup.py --command-packages=stdeb.command sdist_dsc - sh -c 'cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us' - - -####################################################################################### -[testenv:dist_ro_vim_opennebula] -deps = {[testenv]deps} - -r{toxinidir}/requirements-dist.txt -skip_install = true -whitelist_externals = sh -changedir = {toxinidir}/RO-VIM-opennebula -commands = - sh -c 'rm -rf deb_dist dist osm_rovim_opennebula.egg-info osm_rovim_opennebula*.tar.gz' - python3 setup.py --command-packages=stdeb.command sdist_dsc - sh -c 'cd deb_dist/osm-rovim-opennebula*/ && dpkg-buildpackage -rfakeroot -uc -us' - - ####################################################################################### [testenv:dist_ro_vim_openstack] deps = {[testenv]deps} @@ -478,7 +451,8 @@ ignore = E125, E203, E226, - E241 + E241, + E501, exclude = .git, __pycache__, @@ -486,3 +460,4 @@ exclude = max-line-length = 120 show-source = True builtins = _ +import-order-style = google