fix tox docs profiles

- fix ODL version in docs/conf.yaml
- fix base-python version in tox.ini to use any python3 version.
  (better compatibility with potential new requirements)
- reactivate docs and docs-linkcheck profiles
  they only work with python 3.6 in releng at that day
  (because of current lfn-tools requirements)

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7589b3f52c1f6d9f3c996566d59b861192de2c46

diff --git a/docs/conf.yaml b/docs/conf.yaml
index 2dd95bc2969103d2a061453308ff9f7b7859b8d2..748da6dcaf805fa4c1fe888137ac0f800b5441d0 100644 (file)
--- a/docs/conf.yaml
+++ b/docs/conf.yaml
@@ -1,4 +1,4 @@
 project_cfg: opendaylight
 project: Transport PCE
-version: Neon
+version: Magnesium
 

diff --git a/tox.ini b/tox.ini
index 662ea2adf2c88b6c796298f3727502f2deacb342..0880f88666856f9602c875db858402fc4d7a3329 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35
+envlist = py3
     docs
     docs-linkcheck
 skipsdist = true
@@ -9,7 +9,7 @@ setupdir = tests/
 [testenv]
 passenv = USE_LIGHTY
 usedevelop = True
-basepython = python3.5
+basepython = python3
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
@@ -17,24 +17,24 @@ whitelist_externals = bash
                       sudo
 changedir={toxinidir}/tests
 commands =
-  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
-  {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,otn-topology,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
-  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c 'if [ "$USE_LIGHTY" == "True" ]; then (cd ../lighty && ./build.sh); fi'
-  {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
-  {py35,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py
-  {py35,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py
-  {py35,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py
-  {py35,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
-  {py35,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py
-  {py35,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py
+  {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
+  {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,otn-topology,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
+  {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
+  {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c 'if [ "$USE_LIGHTY" == "True" ]; then (cd ../lighty && ./build.sh); fi'
+  {py3,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
+  {py3,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py
+  {py3,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py
+  {py3,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py
+  {py3,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+  {py3,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py
+  {py3,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py
   {end2end}: nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py
-  {py35,portmapping221,rspn221,topology221,otntopology,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1
-  {py35,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
-  {py35,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
+  {py3,portmapping221,rspn221,topology221,otntopology,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1
+  {py3,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
+  {py3,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
   {otntopology}: nosetests --with-xunit transportpce_tests/2.2.1/test_otn_topology.py
-  {py35,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
-  {py35,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
+  {py3,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
+  {py3,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
   {end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
   #{gnpy}: - sudo docker pull atriki/gnpyrest:v1.1
   {gnpy}: - sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.1
@@ -42,12 +42,12 @@ commands =
   {gnpy}: - sudo docker container rm -f gnpy_tpce_rest1
 
 
-#[testenv:docs]
-#deps = -rdocs/requirements.txt
-#commands =
-#    sphinx-build -W -b html -n -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/html
+[testenv:docs]
+deps = -rdocs/requirements.txt
+commands =
+    sphinx-build -W -b html -n -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/html
 
-#[testenv:docs-linkcheck]
-#deps = -rdocs/requirements.txt
-#commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck
+[testenv:docs-linkcheck]
+deps = -rdocs/requirements.txt
+commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck