OTVision 0.6.9__tar.gz → 0.6.10__tar.gz

{otvision-0.6.9 → otvision-0.6.10}/.github/workflows/release-pypi.yml

@@ -31,19 +31,18 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
       - name: Update Python Package Version
         uses: platomo/update-version-py-action@v1.0.1
         with:
           version: ${{ github.ref_name }}
           file-path: "OTVision"
-      - name: Install pypa/build
-        shell: bash
-        run: |
-          python3 -m pip install build --user
-
       - name: Build a binary wheel and a source tarball
         shell: bash
-        run: python -m build --outdir ${{ env.out_dir }}
+        run: uv build --out-dir ${{ env.out_dir }}
 
       - name: Store the distribution packages
         uses: actions/upload-artifact@v4

{otvision-0.6.9 → otvision-0.6.10}/.github/workflows/release-testpypi.yml

@@ -35,6 +35,11 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+
       - name: Get latest tag and create new version
         id: get_version
         run: |
@@ -58,14 +63,9 @@ jobs:
         with:
           version: ${{ steps.get_version.outputs.new_version }}
           file-path: "OTVision"
-      - name: Install pypa/build
-        shell: bash
-        run: |
-          python3 -m pip install build --user
-
       - name: Build a binary wheel and a source tarball
         shell: bash
-        run: python -m build --outdir ${{ env.out_dir }}
+        run: uv build --out-dir ${{ env.out_dir }}
 
       - name: Store the distribution packages
         uses: actions/upload-artifact@v4

otvision-0.6.10/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+---
+name: Test
+
+on:
+  # Run tests each time a PR is opened or changed.
+  # Allow other Workflows (e.g., build workflows) to call this workflow.
+  pull_request:
+  workflow_call:
+
+permissions: read-all
+
+jobs:
+  test:
+    name: Run Python tests on multiple OS and Python versions
+    strategy:
+      fail-fast: True
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        py: ["3.12"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run Python Tests
+        uses: platomo/test-python-app-action@v2
+        timeout-minutes: 60
+        with:
+          py-version: ${{ matrix.py }}
+          package-path: OTVision
+          ffmpeg-required: True

{otvision-0.6.9 → otvision-0.6.10}/OTVision/version.py

@@ -1,4 +1,4 @@
-__version__ = "v0.6.9"
+__version__ = "v0.6.10"
 
 
 def otdet_version() -> str:

{otvision-0.6.9 → otvision-0.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.9
+Version: 0.6.10
 Summary: OTVision is a core module of the OpenTrafficCam framework to perform object detection and tracking.
 Project-URL: Homepage, https://opentrafficcam.org/
 Project-URL: Documentation, https://opentrafficcam.org/overview/
@@ -15,8 +15,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.11
+Requires-Python: ==3.12.*
 Requires-Dist: av==13.0.0
+Requires-Dist: coremltools==8.2; sys_platform == 'darwin'
 Requires-Dist: ffmpeg-python==0.2.0
 Requires-Dist: fire==0.7.0
 Requires-Dist: geopandas==1.0.1
@@ -33,6 +34,12 @@ Requires-Dist: torchvision==0.22.1
 Requires-Dist: tqdm==4.67.1
 Requires-Dist: ujson==5.10.0
 Requires-Dist: ultralytics==8.3.159
+Provides-Extra: cuda
+Requires-Dist: tensorrt-cu12-bindings==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
+Requires-Dist: tensorrt-cu12-libs==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
+Requires-Dist: tensorrt==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
+Requires-Dist: torch; extra == 'cuda'
+Requires-Dist: torchvision; extra == 'cuda'
 Description-Content-Type: text/markdown
 
 # OTVision

{otvision-0.6.9 → otvision-0.6.10}/config.yml

@@ -1,7 +1,7 @@
 base_files:
   - "LICENSE"
   - "README.md"
-  - "requirements.txt"
+  - "pyproject.toml"
   - "user_config.otvision.yaml"
   - "track.py"
   - "detect.py"
@@ -28,26 +28,20 @@ configurations:
     suffix: "macos"
     output_file_name: OTVision
     additional_requirements:
-      - "coremltools==7.2; sys_platform == 'darwin'"
+      - ""
   - package_path: OTVision
     files:
-      - source: "install.cmd"
+      - source: "install_cuda.cmd"
+        destination: "install.cmd"
     suffix: "win-cuda"
     output_file_name: otvision
     additional_requirements:
-      - "--extra-index-url https://pypi.nvidia.com/"
-      - "--extra-index-url https://download.pytorch.org/whl/cu128"
-      - "tensorrt==10.12.0.36"
-      - "tensorrt-cu12-bindings==10.12.0.36"
-      - "tensorrt-cu12-libs==10.12.0.36"
+      - ""
   - package_path: OTVision
     files:
-      - source: "install.sh"
+      - source: "install_cuda.sh"
+        destination: "install.sh"
     suffix: "linux-cuda"
     output_file_name: OTVision
     additional_requirements:
-      - "--extra-index-url https://pypi.nvidia.com/"
-      - "--extra-index-url https://download.pytorch.org/whl/cu128"
-      - "tensorrt==10.12.0.36"
-      - "tensorrt-cu12-bindings==10.12.0.36"
-      - "tensorrt-cu12-libs==10.12.0.36"
+      - ""

otvision-0.6.10/install.cmd

@@ -0,0 +1,19 @@
+echo Install OTVision.
+@echo off
+FOR /F "tokens=* USEBACKQ" %%F IN (`python --version`) DO SET "PYTHON_VERSION=%%F"
+
+echo %PYTHON_VERSION%
+if "x%PYTHON_VERSION:3.12=%"=="x%PYTHON_VERSION%" (
+    echo "Python Version 3.12 is not installed in environment." & cmd /K & exit
+)
+
+REM Check if uv is available globally, if not install it
+where uv >nul 2>nul
+if errorlevel neq 0 (
+    echo uv not found globally, installing uv...
+    powershell -ExecutionPolicy Bypass -Command "& {irm https://astral.sh/uv/install.ps1 | iex}"
+    set "PATH=%USERPROFILE%\.cargo\bin;%PATH%"
+)
+
+uv venv .venv
+uv sync --python .venv%

{otvision-0.6.9 → otvision-0.6.10}/install.sh

@@ -15,12 +15,13 @@ echo "$DIR"
 cd "$DIR" || exit
 WORKING_DIR=$(pwd)
 VENV="$WORKING_DIR"/.venv
-PYTHON="$VENV"/bin/python
-PIP="$VENV"/bin/pip
-UV="$VENV"/bin/uv
 
-python3.12 -m venv "$VENV"
+# Check if uv is available globally, if not install it
+if ! command -v uv &>/dev/null; then
+  echo "uv not found globally, installing uv..."
+  curl -LsSf https://astral.sh/uv/install.sh | sh
+  export PATH="$HOME/.cargo/bin:$PATH"
+fi
 
-$PYTHON -m pip install --upgrade pip
-$PIP install uv
-$UV pip install -r requirements.txt --index-strategy unsafe-best-match --python .venv
+uv venv "$VENV"
+uv sync --python "$VENV"

otvision-0.6.10/install_cuda.cmd

@@ -0,0 +1,19 @@
+echo Install OTVision.
+@echo off
+FOR /F "tokens=* USEBACKQ" %%F IN (`python --version`) DO SET "PYTHON_VERSION=%%F"
+
+echo %PYTHON_VERSION%
+if "x%PYTHON_VERSION:3.12=%"=="x%PYTHON_VERSION%" (
+    echo "Python Version 3.12 is not installed in environment." & cmd /K & exit
+)
+
+REM Check if uv is available globally, if not install it
+where uv >nul 2>nul
+if errorlevel neq 0 (
+    echo uv not found globally, installing uv...
+    powershell -ExecutionPolicy Bypass -Command "& {irm https://astral.sh/uv/install.ps1 | iex}"
+    set "PATH=%USERPROFILE%\.cargo\bin;%PATH%"
+)
+
+uv venv .venv
+uv sync --extra cuda --python .venv

otvision-0.6.10/install_cuda.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
+  SOURCE=$(readlink "$SOURCE")
+  [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
+
+set -e
+echo "Install OTVision."
+
+echo "$DIR"
+cd "$DIR" || exit
+WORKING_DIR=$(pwd)
+VENV="$WORKING_DIR"/.venv
+
+# Check if uv is available globally, if not install it
+if ! command -v uv &>/dev/null; then
+  echo "uv not found globally, installing uv..."
+  curl -LsSf https://astral.sh/uv/install.sh | sh
+  export PATH="$HOME/.cargo/bin:$PATH"
+fi
+
+uv venv "$VENV"
+uv sync --extra cuda --python "$VENV"

{otvision-0.6.9 → otvision-0.6.10}/install_dev.cmd

@@ -1,6 +1,5 @@
 echo Install OTVision development environment.
 call install.cmd
-call .venv\Scripts\activate
-uv pip install -r requirements-dev.txt --python .venv%
+
+uv sync --only-dev --python .venv%
 pre-commit install --install-hooks
-deactivate

{otvision-0.6.9 → otvision-0.6.10}/install_dev.sh

@@ -5,9 +5,8 @@ echo "Install OTVision development environment."
 WORKING_DIR=$(pwd)
 VENV="$WORKING_DIR"/.venv
 PRE_COMMIT="$VENV"/bin/pre-commit
-UV="$VENV"/bin/uv
 
 bash "$WORKING_DIR"/install.sh
 
-$UV pip install -r requirements-dev.txt --python .venv
+uv sync --only-dev --python "$VENV"
 $PRE_COMMIT install --install-hooks

otvision-0.6.10/pyproject.toml

@@ -0,0 +1,157 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "OTVision"
+dynamic = ["version"]
+authors = [
+  { name="OpenTrafficCam contributors", email="team@opentrafficcam.org" },
+  { name="platomo GmbH", email="info@platomo.de" },
+]
+description = "OTVision is a core module of the OpenTrafficCam framework to perform object detection and tracking."
+
+readme = "README.md"
+requires-python = "==3.12.*"
+license = "GPL-3.0-only"
+license-files = ["LICENSE"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+]
+keywords = ["OpenTrafficCam", "Traffic Analysis", "Traffic Counting", "Trajectories"]
+dependencies = [
+    "av==13.0.0",
+    "coremltools==8.2; sys_platform == 'darwin'",
+    "ffmpeg-python==0.2.0",
+    "fire==0.7.0",
+    "geopandas==1.0.1",
+    "ijson==3.3.0",
+    "more-itertools==10.7.0",
+    "moviepy==1.0.3",
+    "numpy==2.1.1; sys_platform != 'win32'",
+    "numpy==1.26.4; sys_platform == 'win32'",
+    "opencv-python==4.10.0.84",
+    "pandas==2.2.3",
+    "PyYAML==6.0.2",
+    "torch==2.7.1",
+    "torchvision==0.22.1",
+    "tqdm==4.67.1",
+    "ujson==5.10.0",
+    "ultralytics==8.3.159",
+]
+
+[dependency-groups]
+dev = [
+    "black==25.1.0",
+    "flake8==7.1.1",
+    "interrogate==1.5.0",
+    "isort==5.13.2",
+    "jsonschema==4.23.0",
+    "mypy==1.15.0",
+    "pandas-stubs==2.2.3.250308",
+    "pre-commit==3.8.0",
+    "pytest==8.3.3",
+    "pytest-cov==5.0.0",
+    "twine==6.1.0",
+    "yamllint==1.35.1",
+]
+
+[project.optional-dependencies]
+cuda = [
+    "torch",
+    "torchvision",
+    "tensorrt==10.12.0.36; sys_platform != 'darwin'",
+    "tensorrt-cu12-bindings==10.12.0.36; sys_platform != 'darwin'",
+    "tensorrt-cu12-libs==10.12.0.36; sys_platform != 'darwin'",
+]
+[project.urls]
+Homepage = "https://opentrafficcam.org/"
+Documentation = "https://opentrafficcam.org/overview/"
+Repository = "https://github.com/OpenTrafficCam/OTVision"
+Issues = "https://github.com/OpenTrafficCam/OTVision/issues"
+Changelog = "https://github.com/OpenTrafficCam/OTVision/releases"
+
+
+[tool.hatch.version]
+path = "OTVision/version.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["OTVision"]
+
+[tool.hatch.build]
+directory = "dist"
+
+[tool.black]
+line-length = 88
+
+[tool.isort]
+profile = "black"
+
+[tool.mypy]
+ignore_missing_imports = true
+ignore_missing_imports_per_module = true
+disallow_untyped_defs = true
+
+[[tool.mypy.overrides]]
+module = "OTVision.view.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "OTVision.transform.*"
+ignore_errors = true
+
+[[tool.uv.dependency-metadata]]
+name = "tensorrt-cu12"
+requires-dist = ["tensorrt-cu12-bindings", "tensorrt-cu12-libs"]
+
+[[tool.uv.dependency-metadata]]
+name = "tensorrt-cu12-libs"
+requires-dist = ["nvidia-cuda-runtime-cu12"]
+
+[[tool.uv.dependency-metadata]]
+name = "nvidia-cuda-runtime-cu12"
+
+[[tool.uv.dependency-metadata]]
+name = "tensorrt-cu12-bindings"
+
+[[tool.uv.dependency-metadata]]
+name = "tensorrt-cu12-libs"
+
+[tool.uv]
+default-groups = []
+environments = [
+    "sys_platform == 'win32'",
+    "sys_platform == 'darwin'",
+    "sys_platform == 'linux'",
+]
+
+[tool.uv.sources]
+torch = [
+  { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
+  { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "cuda" }
+]
+torchvision = [
+  { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
+  { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "cuda" }
+]
+tensorrt = { index = "tensorrt", extra = "cuda" }
+tensorrt-cu12-bindings = { index = "tensorrt", extra = "cuda" }
+tensorrt-cu12-libs = { index = "tensorrt", extra = "cuda" }
+
+[[tool.uv.index]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+explicit = true
+
+[[tool.uv.index]]
+name = "pytorch-cu128"
+url = "https://download.pytorch.org/whl/cu128"
+explicit = true
+
+[[tool.uv.index]]
+name = "tensorrt"
+url = "https://pypi.nvidia.com/"
+explicit = true

{otvision-0.6.9 → otvision-0.6.10}/update_precommit.py

@@ -127,6 +127,16 @@ class CustomDumper(yaml.SafeDumper):
     def increase_indent(self, flow: bool = False, indentless: bool = False) -> None:
         return super(CustomDumper, self).increase_indent(flow, False)
 
+    def choose_scalar_style(self) -> str:
+        # Get the default style choice
+        style = super().choose_scalar_style()
+
+        # If the default choice is single quotes, change to double quotes
+        if style == "'":
+            return '"'
+
+        return style
+
 
 def parse_multiple_requirements_file(
     files: Iterable[Path],