Merge pull request #24 from tilery/feature/add-python-3.12

add python 3.12 support and update pre-commit

.github/workflows/ci.yml

@@ -20,19 +20,18 @@ jobs:
           - {name: Windows, python: '3.10', os: windows-latest}
           - {name: Mac, python: '3.10', os: macos-latest}
           - {name: 'Ubuntu', python: '3.10', os: ubuntu-latest}
-          - {name: '3.11', python: '3.11.0-rc.2 - 3.11', os: ubuntu-latest}
+          - {name: '3.12', python: '3.12', os: ubuntu-latest}
+          - {name: '3.11', python: '3.11', os: ubuntu-latest}
           - {name: '3.9', python: '3.9', os: ubuntu-latest}
           - {name: '3.8', python: '3.8', os: ubuntu-latest}
-          - {name: '3.7', python: '3.7', os: ubuntu-latest}
-          - {name: '3.6', python: '3.6', os: ubuntu-latest}
-          - {name: '3.5', python: '3.5', os: ubuntu-latest}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.pre-commit-config.yaml

@@ -1,27 +1,21 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        language_version: python
-        args: [--safe]
-
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
         language_version: python
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.5
     hooks:
-      - id: flake8
-        language_version: python
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format
 
-  - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.1.1
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.9.0
     hooks:
-      - id: pydocstyle
+      - id: mypy
         language_version: python
-        additional_dependencies:
-          - toml
+        # No reason to run if only tests have changed. They intentionally break typing.
+        exclude: tests/.*

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Release Notes
 
+### 0.0.1b4 - 2022-10-25
+
+- add python 3.12 support
+- remove support for python <3.8
+
 ### 0.0.1b3 - 2022-10-25
 
 - add python 3.9, 3.10, 3.11 support

README.md

@@ -8,15 +8,15 @@ Experimental Python wrapper of [vtzero](https://github.com/mapbox/vtzero) a mini
 
 ## Requirements
 
-- Python >= 3.5
+- Python >= 3.8
 - gcc/clang++ >= 4.5 (C++11)
 
 ## Install
 
 You can install python-vtzero using pip
 
 ```bash
-$ pip install vtzero
+$ python -m pip install vtzero
 ```
 
 or install from source
@@ -30,7 +30,7 @@ $ git submodule update --init
 
 # Compile Cython module
 $ python setup.py build_ext --inplace
-$ pip install -e .
+$ python -m pip install -e .
 ```
 
 ## Example

pyproject.toml

@@ -10,6 +10,21 @@ default_section = "THIRDPARTY"
 [tool.mypy]
 no_strict_optional = "True"
 
-[tool.pydocstyle]
-select = "D1"
-match = "(?!test).*.py"
+[tool.ruff]
+line-length = 90
+
+[tool.ruff.lint]
+select = [
+    "D1",  # pydocstyle errors
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # flake8
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = [
+    "E501",  # line too long, handled by black
+    "B008",  # do not perform function calls in argument defaults
+    "B905",  # ignore zip() without an explicit strict= parameter, only support with python >3.10
+    "B028",
+]

setup.py

@@ -44,4 +44,5 @@
     provides=["vtzero"],
     include_package_data=True,
     extras_require=extra_reqs,
+    python_requires=">=3.8",
 )

tests/test_fixtures.py

@@ -1,3 +1,5 @@
+"""fixtures."""
+
 import json
 from pathlib import Path
 
@@ -26,6 +28,8 @@
 
 @pytest.fixture
 def fixture():
+    """data fixtures."""
+
     def _(id):
         path = ROOT / id
         with (path / "info.json").open("r") as f:
@@ -40,6 +44,7 @@ def _(id):
 
 
 def first_feature(tile):
+    """check and return feature."""
     assert not tile.empty()
     assert len(tile) == 1
     layer = next(tile)
@@ -51,13 +56,15 @@ def first_feature(tile):
 
 
 def test_empty_tile(fixture):
+    """empty tile fixture."""
     info, data, mvt = fixture("001")
     tile = VectorTile(mvt)
     assert tile.empty()
     assert len(tile) == 0
 
 
 def test_single_point_without_id(fixture):
+    """Point."""
     info, data, mvt = fixture("002")
     tile = VectorTile(mvt)
     feature = first_feature(tile)

tests/test_tile.py

@@ -1,3 +1,5 @@
+"""Test tile encoding."""
+
 from vtzero.tile import Layer, Linestring, Point, Polygon, Tile
 
 

vtzero/version.py

@@ -1,3 +1,3 @@
 """vtzero version."""
 
-__version__ = "0.0.1b3"
+__version__ = "0.0.1b4"