Skip to content

Commit 5320509

Browse files
committed
Bump python version >= 3.10
1 parent 9be8871 commit 5320509

File tree

8 files changed

+10
-21
lines changed

8 files changed

+10
-21
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
oas_version: "3.1.1"
5353
python: "3.11"
5454
upper_bounds: true
55+
- image_tag: "3.85"
56+
pulp_https: "true"
57+
python: "3.14"
5558
- image_tag: "3.73"
5659
pulp_domain_enabled: "true"
5760
pulp_enabled_plugins: "['pulp-certguard', 'pulp_container', 'pulp_file', 'pulp_python', 'pulp_rpm']"
@@ -64,14 +67,11 @@ jobs:
6467
pulp_https: "true"
6568
python: "3.10"
6669
- image_tag: "3.39"
70+
pulp_api_root: "/relocated/djnd/"
6771
python: "3.12"
6872
- image_tag: "3.28"
6973
lower_bounds: true
7074
python: "3.13"
71-
- image_tag: "3.22"
72-
lower_bounds: true
73-
pulp_api_root: "/relocated/djnd/"
74-
python: "3.9"
7575
steps:
7676
- uses: "actions/checkout@v5"
7777
- uses: "actions/cache@v4"

CHANGES/+python3.10.removal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dropped support for python 3.9.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dropped support for python 3.9.

lower_bounds_constraints.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ requests==2.25.1;python_version>="3.12"
66
schema==0.7.5
77
tomli==2.0.0
88
tomli-w==1.0.0
9-
importlib_metadata==4.8.0
10-
importlib_resources==5.4.0
119
pygments==2.17.2
1210
click-shell==2.1
1311
SecretStorage==3.3.3

pulp-glue/pulp_glue/common/i18n.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import gettext
2-
import sys
32
from functools import lru_cache
4-
5-
if sys.version_info >= (3, 9):
6-
from importlib.resources import files
7-
else:
8-
from importlib_resources import files
3+
from importlib.resources import files
94

105

116
# Need to call lru_cache() before using it as a decorator for python 3.7 compatibility

pulp-glue/pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "pulp-glue"
77
version = "0.37.0.dev"
88
description = "Version agnostic glue library to talk to pulpcore's REST API."
99
readme = "README.md"
10-
requires-python = ">=3.9,<3.15"
10+
requires-python = ">=3.10,<3.15"
1111
license = {text = "GPLv2+"}
1212
authors = [
1313
{name = "Pulp Team", email = "[email protected]"},
@@ -23,7 +23,6 @@ classifiers = [
2323
"Typing :: Typed",
2424
]
2525
dependencies = [
26-
"importlib_resources>=5.4.0,<6.2;python_version<'3.9'",
2726
"multidict>=6.0.5,<6.8",
2827
"packaging>=20.0,<=25.0", # CalVer
2928
"requests>=2.24.0,<2.33",

pulp_cli/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import os
33
import sys
44
import typing as t
5+
from importlib.metadata import entry_points
56
from types import ModuleType
67

78
import click
@@ -10,11 +11,6 @@
1011
from pulp_cli.config import CONFIG_LOCATIONS, config, config_options, validate_config
1112
from pulp_cli.generic import PulpCLIContext, pulp_group
1213

13-
if sys.version_info >= (3, 10):
14-
from importlib.metadata import entry_points
15-
else:
16-
from importlib_metadata import entry_points
17-
1814
if sys.version_info >= (3, 11):
1915
import tomllib
2016
else:

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "pulp-cli"
77
version = "0.37.0.dev"
88
description = "Command line interface to talk to pulpcore's REST API."
99
readme = "README.md"
10-
requires-python = ">=3.9,<3.15"
10+
requires-python = ">=3.10,<3.15"
1111
license = {text = "GPLv2+"}
1212
authors = [
1313
{name = "Pulp Team", email = "[email protected]"},
@@ -29,7 +29,6 @@ dependencies = [
2929
"schema>=0.7.5,<0.8",
3030
"tomli>=2.0.0,<2.1;python_version<'3.11'",
3131
"tomli-w>=1.0.0,<2",
32-
"importlib_metadata>=4.8.0,<7.1;python_version<'3.10'",
3332
]
3433

3534
[project.optional-dependencies]

0 commit comments

Comments
 (0)