Merge "tox: Fix broken autopep8 target"
diff --git a/doc/source/supported_version.rst b/doc/source/supported_version.rst
index 9c03e7f..2cca456 100644
--- a/doc/source/supported_version.rst
+++ b/doc/source/supported_version.rst
@@ -33,7 +33,7 @@
Tempest master supports the below python versions:
-* Python 3.9
* Python 3.10
* Python 3.11
* Python 3.12
+* Python 3.13
diff --git a/releasenotes/notes/drop-python-3-9-b8a25c06e4bc0787.yaml b/releasenotes/notes/drop-python-3-9-b8a25c06e4bc0787.yaml
new file mode 100644
index 0000000..f9488d7
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-9-b8a25c06e4bc0787.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+ Tempest dropped the support of python 3.9.
+upgrade:
+ - |
+ Python 3.9 support has been dropped. The last release of Tempest
+ to support python 3.9 is Temepst 45.0.0. The minimum version
+ of Python supported by Tempest is python 3.10.
diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml
index 15b1743..1a1b5f4 100644
--- a/roles/run-tempest/tasks/main.yaml
+++ b/roles/run-tempest/tasks/main.yaml
@@ -25,11 +25,11 @@
target_branch: "{{ zuul.override_checkout }}"
when: zuul.override_checkout is defined
-- name: Use stable branch upper-constraints till 2023.1
+- name: Use stable branch upper-constraints till 2025.1
set_fact:
# TOX_CONSTRAINTS_FILE is new name, UPPER_CONSTRAINTS_FILE is old one, best to set both
tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': stable_constraints_file}) | combine({'TOX_CONSTRAINTS_FILE': stable_constraints_file}) }}"
- when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "stable/2023.1", "unmaintained/victoria", "unmaintained/wallaby", "unmaintained/xena", "unmaintained/yoga", "unmaintained/zed", "unmaintained/2023.1"]
+ when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "stable/2023.1", "unmaintained/victoria", "unmaintained/wallaby", "unmaintained/xena", "unmaintained/yoga", "unmaintained/zed", "unmaintained/2023.1", "unmaintained/2024.1", "stable/2024.2", "stable/2025.1"]
- name: Use Configured upper-constraints for non-master Tempest
set_fact:
diff --git a/setup.cfg b/setup.cfg
index 67555f4..fa17801 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,10 +14,10 @@
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
+ Programming Language :: Python :: 3.13
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
diff --git a/tempest/api/compute/servers/test_server_rescue.py b/tempest/api/compute/servers/test_server_rescue.py
index d6c0324..9f96385 100644
--- a/tempest/api/compute/servers/test_server_rescue.py
+++ b/tempest/api/compute/servers/test_server_rescue.py
@@ -282,6 +282,7 @@
"""
block_device_mapping_v2 = [{
"boot_index": "0",
+ "delete_on_termination": "true",
"source_type": "blank",
"volume_size": CONF.volume.volume_size,
"destination_type": "volume"}]
@@ -300,6 +301,7 @@
"""
block_device_mapping_v2 = [{
"boot_index": "0",
+ "delete_on_termination": "true",
"source_type": "image",
"volume_size": CONF.volume.volume_size,
"uuid": CONF.compute.image_ref,
diff --git a/tools/format.sh b/tools/format.sh
index ef5cc92..9685cdf 100755
--- a/tools/format.sh
+++ b/tools/format.sh
@@ -15,7 +15,7 @@
# isort is not compatible with the default flake8 (H306), maybe flake8-isort
# isort -rc -sl -fss ../tempest ../setup.py
-$AUTOPEP8 --exit-code --max-line-length=79 --experimental --in-place \
+$AUTOPEP8 --exit-code --max-line-length=79 --in-place \
-r ../tempest ../setup.py
ERROR=$?
diff --git a/tox.ini b/tox.ini
index aa3be46..5a06912 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = pep8,py39,bashate,pip-check-reqs
+envlist = pep8,py,bashate,pip-check-reqs
minversion = 3.18.0
[tempestenv]
@@ -389,7 +389,7 @@
{[testenv]deps}
autopep8>=2.1.0
commands =
- autopep8 --exit-code --max-line-length=79 --experimental --diff -r tempest setup.py
+ autopep8 --exit-code --max-line-length=79 --diff -r tempest setup.py
flake8 {posargs}
check-uuid
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f51ec75..78688c0 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,10 +8,10 @@
check:
jobs:
- openstack-tox-pep8
- - openstack-tox-py39
- openstack-tox-py310
- openstack-tox-py311
- openstack-tox-py312
+ - openstack-tox-py313
- tempest-full-py3:
# Define list of irrelevant files to use everywhere else
irrelevant-files: &tempest-irrelevant-files
@@ -123,10 +123,10 @@
gate:
jobs:
- openstack-tox-pep8
- - openstack-tox-py39
- openstack-tox-py310
- openstack-tox-py311
- openstack-tox-py312
+ - openstack-tox-py313
- tempest-slow-py3:
irrelevant-files: *tempest-irrelevant-files
- neutron-ovs-grenade-multinode: