[pull] master from junzis:master

.coveragerc

@@ -0,0 +1,12 @@
+[run]
+branch = True
+include = */pyModeS/*
+omit = *tests*
+
+[report]
+exclude_lines =
+    coverage: ignore
+    raise NotImplementedError
+    if TYPE_CHECKING:
+
+ignore_errors = True

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/build-publish.yml

@@ -0,0 +1,74 @@
+name: Build and publish pyModeS
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+env:
+  CIBW_BUILD: cp310* cp311* cp312* cp313*
+  CIBW_ARCHS_WINDOWS: auto64
+  CIBW_ARCHS_LINUX: auto64 aarch64
+  CIBW_ARCHS_MACOS: universal2
+  # CIBW_ARCHS_MACOS: auto universal2
+  CIBW_TEST_SKIP: "*universal2:arm64"
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-14]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        if: runner.os == 'Linux' && runner.arch == 'X64'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Build wheels
+        uses: pypa/[email protected]
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN_PYMODES }}

.gitignore

@@ -5,9 +5,6 @@ __pycache__/
 *.py[cod]
 .pytest_cache/
 
-#cython
-*.c
-
 # C extensions
 *.so
 

README.rst

@@ -94,13 +94,13 @@ If you want to make use of the (faster) c module, install ``pyModeS`` as follows
   # conda (compiled) version
   conda install -c conda-forge pymodes
 
-  # stable version (to be compiled on your side)
-  pip install pyModeS[fast]
+  # stable version
+  pip install pyModeS
 
   # development version
   git clone https://github.com/junzis/pyModeS
   cd pyModeS
-  pip install .[fast]
+  poetry install -E rtlsdr
 
 
 View live traffic (modeslive)
@@ -185,7 +185,6 @@ Core functions for ADS-B decoding
   pms.adsb.position(msg_even, msg_odd, t_even, t_odd, lat_ref=None, lon_ref=None)
   pms.adsb.airborne_position(msg_even, msg_odd, t_even, t_odd)
   pms.adsb.surface_position(msg_even, msg_odd, t_even, t_odd, lat_ref, lon_ref)
-  pms.adsb.surface_velocity(msg)
 
   pms.adsb.position_with_ref(msg, lat_ref, lon_ref)
   pms.adsb.airborne_position_with_ref(msg, lat_ref, lon_ref)
@@ -196,17 +195,18 @@ Core functions for ADS-B decoding
   # Typecode: 19
   pms.adsb.velocity(msg)          # Handles both surface & airborne messages
   pms.adsb.speed_heading(msg)     # Handles both surface & airborne messages
-  pms.adsb.airborne_velocity(msg)
+  pms.adsb.surface_velocity(msg, source)
+  pms.adsb.airborne_velocity(msg, source)
 
 
 Note: When you have a fix position of the aircraft, it is convenient to use `position_with_ref()` method to decode with only one position message (either odd or even). This works with both airborne and surface position messages. But the reference position shall be within 180NM (airborne) or 45NM (surface) of the true position.
 
 
-Decode altitude replies in DF4 / DF20
-**************************************
+Decode altitude replies in DF0 / DF4 / DF16 /DF20
+**************************************************
 .. code:: python
 
-  pms.common.altcode(msg)   # Downlink format must be 4 or 20
+  pms.common.altcode(msg)   # Downlink format must be 0, 4, 16 or 20
 
 
 Decode identity replies in DF5 / DF21
@@ -282,7 +282,7 @@ To identify BDS 4,4 and 4,5 codes, you must set ``mrar`` argument to ``True`` in
 
 .. code:: python
 
-  pms.bds.infer(msg. mrar=True) 
+  pms.bds.infer(msg, mrar=True) 
 
 Once the correct MRAR and MHR messages are identified, decode them as follows:
 
@@ -359,19 +359,8 @@ Here is an example:
 
 Unit test
 ---------
-To perform unit tests, ``pytest`` must be install first.
-
-Build Cython extensions
-::
-
-  $ make ext
-
-Run unit tests
-::
-
-  $ make test
 
-Clean build files
-::
+.. code:: bash
 
-  $ make clean
+  uv sync --dev --all-extras
+  uv run pytest

hatch_build.py

@@ -0,0 +1,81 @@
+import sys
+from pathlib import Path
+
+from Cython.Build import cythonize
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+from setuptools import Distribution, Extension
+from setuptools.command import build_ext
+
+
+class CustomBuildHook(BuildHookInterface):
+    def initialize(self, version, build_data):
+        """Initialize the build hook."""
+        compile_args = []
+
+        if sys.platform == "linux":
+            compile_args += ["-Wno-pointer-sign", "-Wno-unused-variable"]
+
+        extensions = [
+            Extension(
+                "pyModeS.c_common",
+                sources=["src/pyModeS/c_common.pyx"],
+                include_dirs=["src"],
+                extra_compile_args=compile_args,
+            ),
+            Extension(
+                "pyModeS.decoder.flarm.decode",
+                [
+                    "src/pyModeS/decoder/flarm/decode.pyx",
+                    "src/pyModeS/decoder/flarm/core.c",
+                ],
+                extra_compile_args=compile_args,
+                include_dirs=["src/pyModeS/decoder/flarm"],
+            ),
+            # Extension(
+            #     "pyModeS.extra.demod2400.core",
+            #     [
+            #         "src/pyModeS/extra/demod2400/core.pyx",
+            #         "src/pyModeS/extra/demod2400/demod2400.c",
+            #     ],
+            #     extra_compile_args=compile_args,
+            #     include_dirs=["src/pyModeS/extra/demod2400"],
+            #     libraries=["m"],
+            # ),
+        ]
+
+        ext_modules = cythonize(
+            extensions,
+            compiler_directives={"binding": True, "language_level": 3},
+        )
+
+        # Create a dummy distribution object
+        dist = Distribution(dict(name="pyModeS", ext_modules=ext_modules))
+        dist.package_dir = "pyModeS"
+
+        # Create and run the build_ext command
+        cmd = build_ext.build_ext(dist)
+        cmd.verbose = True
+        cmd.ensure_finalized()
+        cmd.run()
+
+        buildpath = Path(cmd.build_lib)
+
+        # Provide locations of compiled modules
+        force_include = {
+            (
+                buildpath / cmd.get_ext_filename("pyModeS.c_common")
+            ).as_posix(): cmd.get_ext_filename("pyModeS.c_common"),
+            (
+                buildpath / cmd.get_ext_filename("pyModeS.decoder.flarm.decode")
+            ).as_posix(): cmd.get_ext_filename("pyModeS.decoder.flarm.decode"),
+        }
+
+        build_data["pure_python"] = False
+        build_data["infer_tag"] = True
+        build_data["force_include"].update(force_include)
+
+        return super().initialize(version, build_data)
+
+    def finalize(self, version, build_data, artifact_path):
+        """Hook called after the build."""
+        return super().finalize(version, build_data, artifact_path)