Merge "Replace the use of assertDictContainsSubset"
diff --git a/manila_tempest_tests/config.py b/manila_tempest_tests/config.py
index dc16100..03dfafb 100644
--- a/manila_tempest_tests/config.py
+++ b/manila_tempest_tests/config.py
@@ -308,6 +308,7 @@
default="manila",
help="Image username."),
cfg.StrOpt("image_password",
+ secret=True,
help="Image password. Should be used for "
"'image_with_share_tools' without Nova Metadata support."),
cfg.StrOpt("client_vm_flavor_ref",
@@ -322,7 +323,7 @@
help="Time to wait for share backup before "
"timing out (seconds)."),
cfg.IntOpt("share_server_migration_timeout",
- default="1500",
+ default=1500,
help="Time to wait for share server migration before "
"timing out (seconds)."),
cfg.StrOpt("default_share_type_name",
diff --git a/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml b/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml
new file mode 100644
index 0000000..97958a9
--- /dev/null
+++ b/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Support for Python 3.6 and 3.7 has been removed. Now the minimum version
+ supported is 3.8 .
diff --git a/setup.cfg b/setup.cfg
index 457bfc2..40a7793 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@
author = OpenStack
author_email = openstack-discuss@lists.openstack.org
home_page = https://docs.openstack.org/manila/latest/
+python_requires = >=3.8
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -14,10 +15,11 @@
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
- Programming Language :: Python :: 3.6
- Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
+ Programming Language :: Python :: 3.9
+ Programming Language :: Python :: 3.10
+ Programming Language :: Python :: 3.11
+ Programming Language :: Python :: 3.12
[files]
packages =
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 1652953..eb25f06 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -16,6 +16,7 @@
- ^doc/.*$
- ^manila/hacking/.*$
- ^manila/tests/.*$
+ - ^\.pre-commit-config\.yaml$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 46d8e5b..68366a3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,13 +15,7 @@
- manila-tempest-plugin-dummy-no-dhss-rbac
- manila-tempest-plugin-container:
voting: false
- - manila-tempest-plugin-glusterfs-nfs:
- voting: false
gate:
jobs:
- manila-tempest-plugin-dummy-no-dhss
- manila-tempest-plugin-dummy-dhss
- experimental:
- jobs:
- - manila-tempest-plugin-glusterfs-native:
- voting: false