Upgrade tox to py312

Change-Id: I60e306fb42ac6b4a779908477e7bb37eb95c3e15
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/README.md b/README.md
index b950d8a..b20867c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -15,17 +15,13 @@ and testing (vIMS, vRouter and vEPC) to ensure that the platforms meet Network
 Functions Virtualization requirements. Raspberry PI is also supported to verify
 datacenters as the lowest cost (50 euros hardware and software included).
 
-| Functest releases | Kubernetes releases           |
-|-------------------|-------------------------------|
-| v1.22             | v1.22                         |
-| v1.23             | v1.23                         |
-| v1.24             | v1.24                         |
-| v1.25             | v1.25                         |
-| v1.26             | v1.26                         |
-| v1.27             | v1.27                         |
-| v1.28             | v1.28                         |
-| v1.29             | v1.29                         |
-| **Master**        | **v1.30.0-alpha.0 (rolling)** |
+| Functest releases | Kubernetes releases |
+|-------------------|---------------------|
+| v1.28             | v1.28               |
+| v1.29             | v1.29               |
+| v1.30             | v1.30               |
+| v1.31             | v1.31               |
+| **Master**        | **latest**          |
 
 ## Prepare your environment
 

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index 3ac80e3..1180905 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -10,7 +10,7 @@
       docker_tags:
         - latest:
             branch: master
-            dependency: '3.16'
+            dependency: '3.20'
       builds:
         dependency:
           repo: _

diff --git a/tox.ini b/tox.ini
index 1e002ab..99fd41b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = pep8,pylint,yamllint,bashate,py310,bandit,perm
+envlist = pep8,pylint,yamllint,bashate,py312,bandit,perm
 
 [testenv]
 usedevelop = True
 deps =
-  -chttps://git.opnfv.org/functest/plain/upper-constraints.txt
+  -c{toxinidir}/upper-constraints.txt
   -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
@@ -17,34 +17,34 @@ commands =
     functest_kubernetes
 
 [testenv:pep8]
-basepython = python3.10
+basepython = python3.12
 commands = flake8
 
 [testenv:pylint]
-basepython = python3.10
+basepython = python3.12
 commands = pylint \
     --ignore-imports=y --min-similarity-lines=10 \
     --disable=locally-disabled,wrong-import-order --reports=n functest_kubernetes
 
 [testenv:yamllint]
-basepython = python3.10
+basepython = python3.12
 files =.travis.yml docker
 commands =
   yamllint {[testenv:yamllint]files}
 
 [testenv:bandit]
-basepython = python3.10
+basepython = python3.12
 commands = bandit -r functest_kubernetes -x tests -n 5 -ll
 
 [testenv:bashate]
-basepython = python3.10
+basepython = python3.12
 files =build.sh functest_kubernetes/ci/download_images.sh
 commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
 
 [testenv:perm]
-basepython = python3.10
+basepython = python3.12
 allowlist_externals = bash
-path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*' -not -path './elements/functest-kubernetes/install.d/*'
+path=. -prune -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*' -not -path './elements/functest-kubernetes/install.d/*'
 commands =
   bash -c "\
     find {[testenv:perm]path} \( -type f -not -perm 644 -o -type d -not -perm 755 \) \
@@ -53,6 +53,6 @@ commands =
     find {[testenv:perm]path} -exec file \{\} + | grep CRLF && exit 1 || exit 0"
 
 [testenv:pre-commit]
-basepython = python3.10
+basepython = python3.12
 commands =
     pre-commit run --all-files --show-diff-on-failure

diff --git a/upper-constraints.txt b/upper-constraints.txt
index c0aafa9..3ac73e1 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,24 +1,9 @@
-git+https://gerrit.opnfv.org/gerrit/functest#egg=functest
-git+https://github.com/collivier/cloudify-rest-client.git@4.3.3-py3#egg=cloudify-rest-client
-robotframework===4.1.2
-robotframework-httplibrary===0.4.2
-robotframework-requests===0.9.2
-robotframework-sshlibrary===3.8.0
 xtesting===1.0.0
-bandit===1.7.5
-bandit===1.7.0
-ruamel.yaml.jinja2==0.2.2
--e git+https://opendev.org/openstack/tempest#egg=tempest
--e git+https://opendev.org/openstack/rally.git#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack
+bandit===1.7.9
 git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes
-pylint===2.11.1
-flake8===4.0.1
-pytest===7.1.2
-pytest-cov===3.0.0
-pytest-html===3.1.1
-ruamel.yaml===0.17.17
-sphinxcontrib-spelling===4.3.0
-ansible-lint===5.2.1
-setuptools_scm===6.3.2
-pre-commit===3.1.1
+pylint===3.2.7
+flake8===7.1.1
+pytest===8.3.2
+pytest-cov===5.0.0
+pytest-html===4.1.1
+pre-commit===3.8.0