Skip to content

Commit

Permalink
Bump minimum python version to 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
VesnaT committed Jan 24, 2025
1 parent 00ffd42 commit 10dc1ac
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 23 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-20.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"

- os: ubuntu-20.04
python-version: "3.10"
test-env: "PyQt5~=5.15.0"
Expand Down Expand Up @@ -49,10 +45,6 @@ jobs:
extra-system-packages: "glibc-tools"

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

- os: macos-13
python-version: "3.10"
test-env: "PyQt5~=5.15.0"
Expand All @@ -78,10 +70,6 @@ jobs:
test-env: "PyQt6~=6.7.0 PyQt6-Qt6~=6.7.0"

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

- os: windows-2019
python-version: "3.10"
test-env: "PyQt5~=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: docs/conf.py

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

python:
install:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import os
import shlex

import importlib_metadata
dist = importlib_metadata.distribution("orange-canvas-core")
import importlib.metadata
dist = importlib.metadata.distribution("orange-canvas-core")

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down
5 changes: 1 addition & 4 deletions orangecanvas/application/examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
from orangecanvas import config as _config
from orangecanvas.utils.pkgmeta import Distribution

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

log = logging.getLogger(__name__)

Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
"pip>=18.0",
"dictdiffer",
"qasync>=0.10.0",
"importlib_metadata>=4.6; python_version<'3.10'",
"importlib_resources; python_version<'3.9'",
"typing_extensions",
"packaging",
"numpy",
Expand Down Expand Up @@ -64,7 +62,7 @@
"Documentation": "https://orange-canvas-core.readthedocs.io/en/latest/",
}

PYTHON_REQUIRES = ">=3.9"
PYTHON_REQUIRES = ">=3.10"


class InstallMultilingualCommand(install):
Expand Down

0 comments on commit 10dc1ac

Please sign in to comment.