Skip to content

Commit

Permalink
Merge pull request #283 from VesnaT/python310
Browse files Browse the repository at this point in the history
Bump minimum python version to 3.10
  • Loading branch information
ales-erjavec authored Feb 7, 2025
2 parents ae29dd0 + e98e6d1 commit 6de8d8f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
include:
- os: ubuntu-22.04
python: 3.9
python: "3.10"

steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/run-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
matrix:
include:
# Linux
- os: ubuntu-20.04
python-version: 3.9
test-env: "PyQt5~=5.14.0 PyQtWebEngine~=5.14.0"

- os: ubuntu-20.04
python-version: "3.10"
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
Expand Down Expand Up @@ -50,10 +46,6 @@ jobs:
extra-system-packages: "libegl1-mesa libxcb-cursor0 glibc-tools"

# macOS
- os: macos-13
python-version: 3.9
test-env: "PyQt5~=5.14.0 PyQtWebEngine~=5.14.0"

- os: macos-14
python-version: "3.10"
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
Expand All @@ -75,10 +67,6 @@ jobs:
test-env: "PyQt6~=6.7.0 PyQt6-Qt6~=6.7.0 PyQt6-WebEngine~=6.7.0 PyQt6-WebEngine-Qt6~=6.7.0"

# Windows
- os: windows-2019
python-version: 3.9
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"

- os: windows-2019
python-version: "3.10"
test-env: "PyQt5~=5.15.0 PyQtWebEngine~=5.15.0"
Expand Down
6 changes: 5 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
version: 2

sphinx:
# Path to your Sphinx configuration file.
configuration: doc/source/conf.py

build:
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.10"

python:
install:
Expand Down
5 changes: 1 addition & 4 deletions orangewidget/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
from orangewidget.utils.itemmodels import PyListModel, signal_blocking


try:
from importlib.resources import files as _resources_files
except ImportError:
from importlib_resources import files as _resources_files
from importlib.resources import files as _resources_files

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

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"typing_extensions>=3.7.4.3",
"orange-canvas-core>=0.2a.dev0,<0.3a",
'appnope; sys_platform=="darwin"',
"importlib_resources; python_version<'3.10'"
]

EXTRAS_REQUIRE = {
Expand Down Expand Up @@ -193,7 +192,7 @@ def setup_package():
},
extras_require=EXTRAS_REQUIRE,
entry_points=ENTRY_POINTS,
python_requires=">=3.9",
python_requires=">=3.10",
zip_safe=False,
)

Expand Down

0 comments on commit 6de8d8f

Please sign in to comment.