Support Python 3.7

VeaaC · VeaaC · commit c260fef8eded · 2026-05-26T09:33:08.000+02:00
Signed-off-by: Christian Vetter &lt;christian.vetter@here.com&gt;
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -12,17 +12,22 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+    name: Build (Python ${{ matrix.python-version }})
     steps:
       - uses: actions/checkout@v2
       - name: Dependencies
         uses: astral-sh/setup-uv@v6
+      - name: Install Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
       - name: Run tests
         run: |
           cd flatdata-generator
-          uv run --with pytest pytest -v
-          pip install .
-          flatdata-generator --help
+          uv run --python ${{ matrix.python-version }} --with pytest pytest -v
       - name: Type check
+        if: contains(fromJSON('["3.10", "3.11", "3.12"]'), matrix.python-version)
         run: |
           cd flatdata-generator
-          uv run --with mypy mypy flatdata/
+          uv run --python ${{ matrix.python-version }} --with mypy mypy flatdata/
diff --git a/.github/workflows/py.yml b/.github/workflows/py.yml
@@ -12,19 +12,26 @@ env:
 jobs:
   Build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+    name: Build (Python ${{ matrix.python-version }})
     steps:
       - uses: actions/checkout@v2
       - name: Dependencies
         uses: astral-sh/setup-uv@v6
+      - name: Install Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
       - name: Run tests
         run: |
           cd flatdata-py
-          uv venv
+          uv venv --python ${{ matrix.python-version }}
           uv pip install ../flatdata-generator
           uv pip install ".[inspector]" pytest mypy
           .venv/bin/pytest -v
           .venv/bin/flatdata-inspector --help
       - name: Type check
+        if: contains(fromJSON('["3.10", "3.11", "3.12"]'), matrix.python-version)
         run: |
           cd flatdata-py
           .venv/bin/mypy flatdata/
diff --git a/flatdata-generator/flatdata/generator/engine.py b/flatdata-generator/flatdata/generator/engine.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import types
 from typing import overload
 
diff --git a/flatdata-generator/flatdata/generator/generators/__init__.py b/flatdata-generator/flatdata/generator/generators/__init__.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 from abc import ABCMeta, abstractmethod
 from typing import NoReturn
 
diff --git a/flatdata-generator/flatdata/generator/generators/cpp.py b/flatdata-generator/flatdata/generator/generators/cpp.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import posixpath
 
 from jinja2 import Environment
diff --git a/flatdata-generator/flatdata/generator/generators/dot.py b/flatdata-generator/flatdata/generator/generators/dot.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.archive import Archive
 from flatdata.generator.tree.nodes.trivial import Field
 from flatdata.generator.tree.syntax_tree import SyntaxTree
diff --git a/flatdata-generator/flatdata/generator/generators/flatdata.py b/flatdata-generator/flatdata/generator/generators/flatdata.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 from jinja2 import Environment
 
 from flatdata.generator.tree.nodes.node import Node
diff --git a/flatdata-generator/flatdata/generator/generators/python.py b/flatdata-generator/flatdata/generator/generators/python.py
@@ -2,6 +2,8 @@
  Copyright (c) 2017 HERE Europe B.V.
  See the LICENSE file in the root of this project for license details.
 '''
+
+from __future__ import annotations
 from jinja2 import Environment
 
 from flatdata.generator.tree.nodes.resources import Instance, Vector, Multivector, RawData
diff --git a/flatdata-generator/flatdata/generator/generators/rust.py b/flatdata-generator/flatdata/generator/generators/rust.py
@@ -2,6 +2,8 @@
  Copyright (c) 2018 HERE Europe B.V.
  See the LICENSE file in the root of this project for license details.
 '''
+
+from __future__ import annotations
 import posixpath
 import re
 
diff --git a/flatdata-generator/flatdata/generator/tree/builder.py b/flatdata-generator/flatdata/generator/tree/builder.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import os
 from typing import Any
 
diff --git a/flatdata-generator/flatdata/generator/tree/helpers/basictype.py b/flatdata-generator/flatdata/generator/tree/helpers/basictype.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator import grammar
 from flatdata.generator.tree.errors import InvalidWidthError
 from flatdata.generator.tree.errors import InvalidSignError
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/archive.py b/flatdata-generator/flatdata/generator/tree/nodes/archive.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.errors import UnexpectedResourceType
 from flatdata.generator.tree.nodes.node import Node
 import flatdata.generator.tree.nodes.resources as resources
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/explicit_reference.py b/flatdata-generator/flatdata/generator/tree/nodes/explicit_reference.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import ResourceReference, FieldReference, StructureReference
 
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/references.py b/flatdata-generator/flatdata/generator/tree/nodes/references.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .node import Node
 
 class Reference(Node):
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/archive.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/archive.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import ArchiveReference
 from .base import ResourceBase
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/base.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/base.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 
 from abc import ABC, abstractmethod
 
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/bound_resource.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/bound_resource.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import BuiltinStructureReference, ResourceReference, StructureReference
 from .base import ResourceBase
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/instance.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/instance.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import StructureReference
 from .base import ResourceBase
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/multivector.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/multivector.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import StructureReference, BuiltinStructureReference
 from flatdata.generator.tree.nodes.trivial import Structure
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/rawdata.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/rawdata.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from .base import ResourceBase
 
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/resources/vector.py b/flatdata-generator/flatdata/generator/tree/nodes/resources/vector.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import StructureReference
 from .base import ResourceBase
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/constant.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/constant.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.helpers.basictype import BasicType
 from flatdata.generator.tree.errors import InvalidConstantValueError
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/enumeration.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/enumeration.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.errors import DuplicateEnumValueError, InvalidEnumValueError, SparseEnumError
 from flatdata.generator.tree.helpers.basictype import BasicType
 from flatdata.generator.tree.nodes.node import Node
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/enumeration_value.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/enumeration_value.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 
 from pyparsing import ParseResults
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/field.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/field.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from flatdata.generator.tree.nodes.references import EnumerationReference, ConstantValueReference, InvalidValueReference
 from flatdata.generator.tree.helpers.basictype import BasicType
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/namespace.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/namespace.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 from pyparsing import ParseResults
 
 from flatdata.generator.tree.nodes.node import Node
diff --git a/flatdata-generator/flatdata/generator/tree/nodes/trivial/structure.py b/flatdata-generator/flatdata/generator/tree/nodes/trivial/structure.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from flatdata.generator.tree.nodes.node import Node
 from .field import Field
 
diff --git a/flatdata-generator/flatdata/generator/tree/resolver.py b/flatdata-generator/flatdata/generator/tree/resolver.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Iterable
 
 import flatdata.generator.tree.nodes.references as refs
diff --git a/flatdata-generator/flatdata/generator/tree/traversal.py b/flatdata-generator/flatdata/generator/tree/traversal.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from abc import ABCMeta, abstractmethod
 
 from collections import deque
diff --git a/flatdata-generator/pyproject.toml b/flatdata-generator/pyproject.toml
@@ -7,7 +7,7 @@ name = "flatdata-generator"
 version = "0.4.11"
 description = "Generate source code for C++, Rust, or Python from a Flatdata schema file"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.7"
 authors = [
     { name = "Flatdata Developers" },
 ]
diff --git a/flatdata-generator/tests/tree/test_importer.py b/flatdata-generator/tests/tree/test_importer.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import os
 import tempfile
 
diff --git a/flatdata-py/flatdata/lib/errors.py b/flatdata-py/flatdata/lib/errors.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 """
 
+from __future__ import annotations
+
 import difflib
 
 
diff --git a/flatdata-py/flatdata/lib/file_resource_writer.py b/flatdata-py/flatdata/lib/file_resource_writer.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import os
 from typing import IO
 
diff --git a/flatdata-py/flatdata/lib/inspector.py b/flatdata-py/flatdata/lib/inspector.py
@@ -3,6 +3,8 @@
  See the LICENSE file in the root of this project for license details.
 '''
 
+from __future__ import annotations
+
 import argparse
 import fnmatch
 import os
diff --git a/flatdata-py/flatdata/lib/structure.py b/flatdata-py/flatdata/lib/structure.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections import namedtuple
 from collections.abc import Callable, Iterator
 import json
diff --git a/flatdata-py/pyproject.toml b/flatdata-py/pyproject.toml
@@ -7,7 +7,7 @@ name = "flatdata-py"
 version = "0.4.11"
 description = "Python 3 implementation of Flatdata"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.7"
 authors = [
     { name = "Flatdata Developers" },
 ]
