Skip to content

Commit c193741

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Drop support for Python 3.10"
2 parents 6de365b + 7717011 commit c193741

6 files changed

Lines changed: 19 additions & 16 deletions

File tree

.zuul.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
zuul_work_dir: src/opendev.org/openstack/python-openstackclient
2424

2525
- job:
26-
name: osc-tox-py310-tips
27-
parent: openstack-tox-py310
26+
name: osc-tox-py311-tips
27+
parent: openstack-tox-py311
2828
description: |
2929
Run unit tests for OpenStackClient with master branch of important libs.
3030
@@ -43,8 +43,8 @@
4343
zuul_work_dir: src/opendev.org/openstack/python-openstackclient
4444

4545
- job:
46-
name: osc-tox-py313-tips
47-
parent: openstack-tox-py313
46+
name: osc-tox-py314-tips
47+
parent: openstack-tox-py314
4848
description: |
4949
Run unit tests for OpenStackClient with master branch of important libs.
5050
@@ -155,12 +155,12 @@
155155
name: osc-tox-unit-tips
156156
check:
157157
jobs:
158-
- osc-tox-py310-tips
159-
- osc-tox-py313-tips
158+
- osc-tox-py311-tips
159+
- osc-tox-py314-tips
160160
gate:
161161
jobs:
162-
- osc-tox-py310-tips
163-
- osc-tox-py313-tips
162+
- osc-tox-py311-tips
163+
- osc-tox-py314-tips
164164

165165
- project:
166166
templates:

openstackclient/compute/v2/usage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def _format_project(project: str) -> str:
157157
)
158158

159159
date_cli_format = "%Y-%m-%d"
160-
now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
160+
now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
161161

162162
if parsed_args.start:
163163
start = datetime.datetime.strptime(
@@ -243,7 +243,7 @@ def take_action(
243243
identity_client = self.app.client_manager.identity
244244
compute_client = self.app.client_manager.compute
245245
date_cli_format = "%Y-%m-%d"
246-
now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
246+
now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
247247

248248
if parsed_args.start:
249249
start = datetime.datetime.strptime(

openstackclient/image/v2/cache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ def _format_image_cache(cached_images: dict[str, Any]) -> list[dict[str, Any]]:
4141
image_obj['state'] = 'cached'
4242
image_obj['last_accessed'] = (
4343
datetime.datetime.fromtimestamp(
44-
image['last_accessed'], tz=datetime.timezone.utc
44+
image['last_accessed'], tz=datetime.UTC
4545
)
4646
.replace(tzinfo=None)
4747
.isoformat()
4848
)
4949
image_obj['last_modified'] = (
5050
datetime.datetime.fromtimestamp(
51-
image['last_modified'], tz=datetime.timezone.utc
51+
image['last_modified'], tz=datetime.UTC
5252
)
5353
.replace(tzinfo=None)
5454
.isoformat()

openstackclient/tests/functional/identity/v3/test_application_credential.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_application_credential_create_with_options(self):
107107
secret = data_utils.rand_name('secret')
108108
description = data_utils.rand_name('description')
109109
tomorrow = (
110-
datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
110+
datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
111111
+ datetime.timedelta(days=1)
112112
).strftime('%Y-%m-%dT%H:%M:%S%z')
113113
role1, role2 = self._create_role_assignments()

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ authors = [
1111
readme = {file = "README.rst", content-type = "text/x-rst"}
1212
license = "Apache-2.0"
1313
dynamic = ["version", "dependencies"]
14-
requires-python = ">=3.10"
14+
requires-python = ">=3.11"
1515
classifiers = [
1616
"Environment :: OpenStack",
1717
"Intended Audience :: Information Technology",
1818
"Intended Audience :: System Administrators",
1919
"Operating System :: POSIX :: Linux",
2020
"Programming Language :: Python",
2121
"Programming Language :: Python :: 3",
22-
"Programming Language :: Python :: 3.10",
2322
"Programming Language :: Python :: 3.11",
2423
"Programming Language :: Python :: 3.12",
2524
"Programming Language :: Python :: 3.13",
@@ -780,7 +779,7 @@ volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot"
780779
include = ["openstackclient"]
781780

782781
[tool.mypy]
783-
python_version = "3.10"
782+
python_version = "3.11"
784783
show_column_numbers = true
785784
show_error_context = true
786785
ignore_missing_imports = true
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
Support for Python 3.10 has been dropped.

0 commit comments

Comments
 (0)