Skip to content

Commit 6de8d8f

Browse files
authored
Merge pull request #283 from VesnaT/python310
Bump minimum python version to 3.10
2 parents ae29dd0 + e98e6d1 commit 6de8d8f

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

.github/workflows/run-docs-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
include:
1818
- os: ubuntu-22.04
19-
python: 3.9
19+
python: "3.10"
2020

2121
steps:
2222
- uses: actions/checkout@v4

.github/workflows/run-tests-workflow.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
matrix:
1818
include:
1919
# Linux
20-
- os: ubuntu-20.04
21-
python-version: 3.9
22-
test-env: "PyQt5~=5.14.0 PyQtWebEngine~=5.14.0"
23-
2420
- os: ubuntu-20.04
2521
python-version: "3.10"
2622
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
@@ -50,10 +46,6 @@ jobs:
5046
extra-system-packages: "libegl1-mesa libxcb-cursor0 glibc-tools"
5147

5248
# macOS
53-
- os: macos-13
54-
python-version: 3.9
55-
test-env: "PyQt5~=5.14.0 PyQtWebEngine~=5.14.0"
56-
5749
- os: macos-14
5850
python-version: "3.10"
5951
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
@@ -75,10 +67,6 @@ jobs:
7567
test-env: "PyQt6~=6.7.0 PyQt6-Qt6~=6.7.0 PyQt6-WebEngine~=6.7.0 PyQt6-WebEngine-Qt6~=6.7.0"
7668

7769
# Windows
78-
- os: windows-2019
79-
python-version: 3.9
80-
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
81-
8270
- os: windows-2019
8371
python-version: "3.10"
8472
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"

.readthedocs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
version: 2
22

3+
sphinx:
4+
# Path to your Sphinx configuration file.
5+
configuration: doc/source/conf.py
6+
37
build:
48
os: ubuntu-22.04
59
tools:
6-
python: "3.9"
10+
python: "3.10"
711

812
python:
913
install:

orangewidget/gui.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
from orangewidget.utils.itemmodels import PyListModel, signal_blocking
3030

3131

32-
try:
33-
from importlib.resources import files as _resources_files
34-
except ImportError:
35-
from importlib_resources import files as _resources_files
32+
from importlib.resources import files as _resources_files
3633

3734
__re_label = re.compile(r"(^|[^%])%\((?P<value>[a-zA-Z]\w*)\)")
3835

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"typing_extensions>=3.7.4.3",
6161
"orange-canvas-core>=0.2a.dev0,<0.3a",
6262
'appnope; sys_platform=="darwin"',
63-
"importlib_resources; python_version<'3.10'"
6463
]
6564

6665
EXTRAS_REQUIRE = {
@@ -193,7 +192,7 @@ def setup_package():
193192
},
194193
extras_require=EXTRAS_REQUIRE,
195194
entry_points=ENTRY_POINTS,
196-
python_requires=">=3.9",
195+
python_requires=">=3.10",
197196
zip_safe=False,
198197
)
199198

0 commit comments

Comments
 (0)