From 10dc1aca70a3487949dd841a12b0ef4666303d65 Mon Sep 17 00:00:00 2001
From: Vesna Tanko <tankovesna@hotmail.com>
Date: Fri, 24 Jan 2025 10:10:15 +0100
Subject: [PATCH] Bump minimum python version to 3.10

---
 .github/workflows/run-docs-build.yml     |  2 +-
 .github/workflows/run-tests-workflow.yml | 12 ------------
 .readthedocs.yml                         |  6 +++++-
 docs/source/conf.py                      |  4 ++--
 orangecanvas/application/examples.py     |  5 +----
 setup.py                                 |  4 +---
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/run-docs-build.yml b/.github/workflows/run-docs-build.yml
index 29ab62cd..6bcea04c 100644
--- a/.github/workflows/run-docs-build.yml
+++ b/.github/workflows/run-docs-build.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            python: "3.9"
+            python: "3.10"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/run-tests-workflow.yml b/.github/workflows/run-tests-workflow.yml
index 5a81412c..f6b1eb5e 100644
--- a/.github/workflows/run-tests-workflow.yml
+++ b/.github/workflows/run-tests-workflow.yml
@@ -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"
@@ -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"
@@ -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"
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 95889b0c..697bb6c3 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -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:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 50919559..b3ea9c51 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -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
diff --git a/orangecanvas/application/examples.py b/orangecanvas/application/examples.py
index 0858659d..c39bc5d0 100644
--- a/orangecanvas/application/examples.py
+++ b/orangecanvas/application/examples.py
@@ -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__)
 
diff --git a/setup.py b/setup.py
index 37888807..aac91f45 100755
--- a/setup.py
+++ b/setup.py
@@ -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",
@@ -64,7 +62,7 @@
     "Documentation": "https://orange-canvas-core.readthedocs.io/en/latest/",
 }
 
-PYTHON_REQUIRES = ">=3.9"
+PYTHON_REQUIRES = ">=3.10"
 
 
 class InstallMultilingualCommand(install):