X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=tox.ini;h=c6504901272a5edd7d05fbd522095e4a18cdfd4a;hp=34e22ae747d164c90d4968c71bd4fbc4e776292e;hb=8348393fab54da94964cd1069ab126e5d555ab07;hpb=89278b8df3845c0c1fa862ba9be8c635ce3bfa64

diff --git a/tox.ini b/tox.ini
index 34e22ae7..c6504901 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@
 #######################################################################################
 
 [tox]
-envlist = black, cover, flake8, pylint, safety
+envlist = black, flake8, safety
 
 [tox:jenkins]
 toxworkdir = /tmp/.tox
@@ -56,8 +56,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
@@ -114,12 +112,6 @@ commands =
         # 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'
         # 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'
@@ -133,7 +125,7 @@ commands =
         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_opennebula .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware 
+        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 report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit='*tests*'
@@ -141,29 +133,29 @@ commands =
 
 #######################################################################################
 [testenv:flake8]
-deps = flake8
+deps =
+        flake8
+        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/
 
 
 #######################################################################################
@@ -187,8 +179,6 @@ commands =
         - 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
@@ -209,14 +199,19 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==5.5.0
+deps =  pip-tools==6.4.0
 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 +384,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}
@@ -486,3 +455,4 @@ exclude =
 max-line-length = 120
 show-source = True
 builtins = _
+import-order-style = google