From 1bb1d7bf15e3f76b5dc2d6096531a507c7108b98 Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Mon, 11 Nov 2024 10:40:17 +0200
Subject: [PATCH 1/2] pyproject: bump min python to 3.10

---
 .editorconfig            |  7 ++++--
 .github/workflows/ci.yml |  2 --
 .gitlab-ci.yml           | 48 ++++++++++++++++++++--------------------
 pyproject.toml           |  9 ++++++--
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index dcbc21d..ee0c1d9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
 # https://editorconfig.org/
-# https://github.com/editorconfig/editorconfig-vim 
-# https://github.com/editorconfig/editorconfig-emacs 
+# https://github.com/editorconfig/editorconfig-vim
+# https://github.com/editorconfig/editorconfig-emacs
 
 root = true
 
@@ -23,6 +23,9 @@ indent_size = 2
 [*.hpp]
 indent_size = 2
 
+[*.yml]
+indent_size = 4
+
 # There may be one in doc/
 [Makefile]
 indent_style = tab
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 149a000..04d3130 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,5 +73,3 @@ jobs:
 
                 build_py_project_in_conda_env
                 test_py_project
-
-# vim: sw=4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b87cc4e..f598f42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,29 +1,29 @@
 Ruff:
-  script: |
-    pipx install ruff
-    ruff check
-  tags:
-  - docker-runner
-  except:
-  - tags
+    script: |
+        pipx install ruff
+        ruff check
+    tags:
+        - docker-runner
+    except:
+        - tags
 
 Python 3:
-  script:
-  - py_version=3
-  - export EXTRA_INSTALL="numpy"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
-  tags:
-  - python3
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
+    script: |
+        py_version=3
+        export EXTRA_INSTALL="numpy"
+        curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+        . ./build-and-test-py-project.sh
+    tags:
+        - python3
+    except:
+        - tags
+    artifacts:
+        reports:
+            junit: test/pytest.xml
 
 Documentation:
-  script:
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
-  - ". ./build-docs.sh"
-  tags:
-  - python3
+    script: |
+        curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
+        . ./build-docs.sh
+    tags:
+        - python3
diff --git a/pyproject.toml b/pyproject.toml
index 92b992e..429e804 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,14 +6,14 @@ requires = [
 
 [project]
 name = "gmsh_interop"
-version = "2024.1"
+version = "2024.2"
 description = "A parser for GMSH's .msh format"
 readme = "README.rst"
 license = { text = "MIT" }
 authors = [
     { name = "Andreas Kloeckner", email = "inform@tiker.net" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -37,6 +37,11 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+doc = [
+    "furo",
+    "sphinx>=4",
+    "sphinx-copybutton",
+]
 test = [
     "pytest",
     "ruff",

From 504c434ad64132051e294f5c30420f294b2d9468 Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Mon, 11 Nov 2024 10:42:10 +0200
Subject: [PATCH 2/2] ruff: fix type import errors

---
 gmsh_interop/runner.py  | 12 ++++--------
 gmsh_interop/version.py |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gmsh_interop/runner.py b/gmsh_interop/runner.py
index 3e4aa31..84f4949 100644
--- a/gmsh_interop/runner.py
+++ b/gmsh_interop/runner.py
@@ -23,13 +23,9 @@
 THE SOFTWARE.
 """
 
-try:
-    from packaging.version import Version
-except ImportError:
-    from distutils.version import Version
-
 import logging
-from typing import Optional
+
+from packaging.version import Version
 
 from pytools import memoize_method
 
@@ -125,11 +121,11 @@ def __init__(self, source, filenames, source_name="temp.geo"):
         self.filenames = filenames
 
 
-def get_gmsh_version(executable: str = "gmsh") -> Optional[Version]:
+def get_gmsh_version(executable: str = "gmsh") -> Version | None:
     import re
     re_version = re.compile(r"[0-9]+.[0-9]+.[0-9]+")
 
-    def get_gmsh_version_from_string(output: str) -> Optional[Version]:
+    def get_gmsh_version_from_string(output: str) -> Version | None:
         result = re_version.search(output)
 
         try_version = None
diff --git a/gmsh_interop/version.py b/gmsh_interop/version.py
index 15679ab..7e75b3b 100644
--- a/gmsh_interop/version.py
+++ b/gmsh_interop/version.py
@@ -1,8 +1,7 @@
 from importlib import metadata
-from typing import Tuple
 
 
-def _parse_version(version: str) -> Tuple[Tuple[int, ...], str]:
+def _parse_version(version: str) -> tuple[tuple[int, ...], str]:
     import re
 
     m = re.match("^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)