From 10536d35b94973b2ab835ff04b084c712f6d5825 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:00:17 +0100
Subject: [PATCH 01/33] Update metadata in pyproject.toml

---
 pyproject.toml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6338d7abd..41e63852c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,8 +4,30 @@ build-backend = "hatchling.build"
 
 [project]
 name = "OTAnalytics"
-version = "0.0.1"
-dynamic = ["dependencies"]
+dynamic = ["dependencies", "version"]
+authors = [
+  { name="Martin Bärwolff", email="martin.baerwolff@platomo.com" },
+  { name="Lars Briem", email="lars.briem@platomo.com" },
+  { name="Sebastian Buck", email="sebastian.buck@platomo.com" },
+  { name="Michael Heilig", email="michael.heilig@platomo.com" },
+  { name="Randy Seng", email="randy.seng@platomo.com" },
+  { name="Steven Schlechte", email="steven.schlechte@platomo.com" },
+]
+description = "OTAnalytics is a core module of the OpenTrafficCam framework to perform traffic analysis on trajectories of road users."
+readme = "README.md"
+requires-python = ">=3.11"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+]
+keywords = ["OpenTrafficCam", "Traffic Analysis", "Traffic Counting"]
+
+[project.urls]
+Homepage = "https://opentrafficcam.org/"
+Documentation = "https://opentrafficcam.org/overview/"
+Repository = "https://github.com/OpenTrafficCam/OTAnalytics"
+Issues = "https://github.com/OpenTrafficCam/OTAnalytics/issues"
 
 [tool.hatch.metadata.hooks.requirements_txt]
 files = ["requirements.txt"]

From acbe904dec824504294bab6656df870f9f1e6d34 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 12:54:35 +0100
Subject: [PATCH 02/33] Specify OTAnalytics as package in pyproject.toml

---
 pyproject.toml       | 3 +++
 requirements-dev.txt | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 41e63852c..41afaacf3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,6 +35,9 @@ files = ["requirements.txt"]
 [tool.hatch.version]
 path = "OTAnalytics/version.py"
 
+[tool.hatch.build.targets.wheel]
+packages = ["OTAnalytics"]
+
 [tool.black]
 line-length = 88
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3eab19f2d..38b000a90 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,7 @@
 -r requirements.txt
 black==24.2.0
 flake8==7.0.0
+hatch-requirements-txt==0.4.1
 interrogate==1.5.0
 isort==5.13.2
 mypy==1.8.0

From 3c4d98ed9e84d10ece70e80cd13b2af331baf75e Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:53:40 +0100
Subject: [PATCH 03/33] Add pypa's build to dev dependencies to build
 distribution

---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 38b000a90..6af22db44 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,6 @@
 -r requirements.txt
 black==24.2.0
+build==1.1.1
 flake8==7.0.0
 hatch-requirements-txt==0.4.1
 interrogate==1.5.0

From d1c5c4cd3fa86c5f9bcbfa023fd1a9fb01be88be Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:00:56 +0100
Subject: [PATCH 04/33] Add twine to dev dependencies to upload distribution to
 PyPI or TestPyPI

---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 6af22db44..4bdea8a62 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,4 +10,5 @@ pre-commit==3.6.2
 pytest==8.0.0
 pytest-benchmark==4.0.0
 pytest-cov==4.1.0
+twine==5.0.0
 yamllint==1.35.1

From 26865052ff5df20138939204c2cde21603770697 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:24:13 +0100
Subject: [PATCH 05/33] Add GitHub workflow to publish OTAnalytics to TestPypi

---
 .github/workflows/publish-testpypi.yml | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/publish-testpypi.yml

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
new file mode 100644
index 000000000..2da3eaf23
--- /dev/null
+++ b/.github/workflows/publish-testpypi.yml
@@ -0,0 +1,47 @@
+---
+# This workflow will install Python dependencies, run tests
+
+name: Run CI/CD
+
+on: push
+
+jobs:
+  build-n-publish:
+    name: Build and upload release to PyPI
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: True
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.10"]
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/project/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION-RSENG
+    permissions:
+      actions: read
+      contents: read
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install pypa/build
+        run: >-
+          python -m
+          pip install
+          build
+          --user
+      - name: Build a binary wheel and a source tarball
+        run: >-
+          python -m
+          build
+          --sdist
+          --wheel
+          --outdir dist/
+          .
+      - name: Publish package distributions to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

From 7c6032e45257e53cbc1d11fe0f9136d66f59a904 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:28:57 +0100
Subject: [PATCH 06/33] Only publish to TestPyPI when test workflow succeeds

---
 .github/workflows/publish-testpypi.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 2da3eaf23..3b1e29cd4 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -7,7 +7,8 @@ on: push
 
 jobs:
   build-n-publish:
-    name: Build and upload release to PyPI
+    needs: test
+    name: Build and upload release to TestPyPI
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: True

From 3d6c550d349b387bcb7a8e787acf527c098235a2 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:30:11 +0100
Subject: [PATCH 07/33] Match pyproject.toml project name to TestPyPI project
 name

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 41afaacf3..8c46e5669 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-requirements-txt"]
 build-backend = "hatchling.build"
 
 [project]
-name = "OTAnalytics"
+name = "OTAnalytics-EXAMPLE-DISTRIBUTION-RSENG"
 dynamic = ["dependencies", "version"]
 authors = [
   { name="Martin Bärwolff", email="martin.baerwolff@platomo.com" },

From 570c6023c26c1c85cae3c9e51c47819ec55e074c Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:35:00 +0100
Subject: [PATCH 08/33] Change python version in publish-testpypi.yml workflow
 and remove test workflow requirement

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 3b1e29cd4..9efcda0c4 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -7,14 +7,14 @@ on: push
 
 jobs:
   build-n-publish:
-    needs: test
+#    needs: test
     name: Build and upload release to TestPyPI
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: True
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.10"]
+        python-version: ["3.11"]
     environment:
       name: testpypi
       url: https://test.pypi.org/project/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION-RSENG

From 2bf4d913398732955afc59beb4ea9e66f9681c3b Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:39:49 +0100
Subject: [PATCH 09/33] Fix project name to match TestPyPI project URL defined
 in publish-testpypi.yml

---
 .github/workflows/publish-testpypi.yml | 2 +-
 pyproject.toml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 9efcda0c4..c3e674816 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -17,7 +17,7 @@ jobs:
         python-version: ["3.11"]
     environment:
       name: testpypi
-      url: https://test.pypi.org/project/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION-RSENG
+      url: https://test.pypi.org/project/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION
     permissions:
       actions: read
       contents: read
diff --git a/pyproject.toml b/pyproject.toml
index 8c46e5669..738476a57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-requirements-txt"]
 build-backend = "hatchling.build"
 
 [project]
-name = "OTAnalytics-EXAMPLE-DISTRIBUTION-RSENG"
+name = "OTAnalytics-EXAMPLE-DISTRIBUTION"
 dynamic = ["dependencies", "version"]
 authors = [
   { name="Martin Bärwolff", email="martin.baerwolff@platomo.com" },

From 20961db2cbb4f0bad5de9bb9375aabb40db301a5 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:09:07 +0100
Subject: [PATCH 10/33] Fix publish-testpypi.yml not working

---
 .github/workflows/publish-testpypi.yml | 3 ++-
 pyproject.toml                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index c3e674816..9328ef79d 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -17,7 +17,7 @@ jobs:
         python-version: ["3.11"]
     environment:
       name: testpypi
-      url: https://test.pypi.org/project/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION
+      url: https://test.pypi.org/p/OTAnalytics-EXAMPLE-TEST-DISTRIBUTION
     permissions:
       actions: read
       contents: read
@@ -46,3 +46,4 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
+          verbose: true
diff --git a/pyproject.toml b/pyproject.toml
index 738476a57..cd4ee45ea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-requirements-txt"]
 build-backend = "hatchling.build"
 
 [project]
-name = "OTAnalytics-EXAMPLE-DISTRIBUTION"
+name = "OTAnalytics-EXAMPLE-TEST-DISTRIBUTION"
 dynamic = ["dependencies", "version"]
 authors = [
   { name="Martin Bärwolff", email="martin.baerwolff@platomo.com" },

From 33337ff8d8a51b34e1272194fdd4271e18018766 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:40:55 +0100
Subject: [PATCH 11/33] Enable dynamic versioning

---
 .github/workflows/publish-testpypi.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 9328ef79d..dd86dd843 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -7,7 +7,7 @@ on: push
 
 jobs:
   build-n-publish:
-#    needs: test
+    #    needs: test
     name: Build and upload release to TestPyPI
     runs-on: ${{ matrix.os }}
     strategy:
@@ -23,11 +23,29 @@ jobs:
       contents: read
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Check-out platomo-build repository
+        uses: actions/checkout@v4
+        with:
+          repository: platomo/platomo-build
+          token: ${{ secrets.PLATOMO_BUILDER_ACCESS }}
+          path: platomo-build
+      - name: Install builder dependencies
+        run: |
+          cd platomo-build
+          python -m pip install --upgrade pip
+          if [ -f "requirements.txt" ]; then
+              pip install -r requirements.txt
+          fi
+          if [ -f "requirements-dev.txt" ]; then
+              pip install -r requirements-dev.txt
+          fi
+      - name: Build release assets
+        run: python ./platomo-build/build.py --package_version ${{ inputs.package-version }}
       - name: Install pypa/build
         run: >-
           python -m

From 1efd5fdce6f57a88dbe6d167a95d35079aa60962 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:44:56 +0100
Subject: [PATCH 12/33] Use dummy value for package version

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index dd86dd843..ee7b39e0c 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,7 +45,7 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version ${{ inputs.package-version }}
+        run: python ./platomo-build/build.py --package_version ${{ 0.0.1 }}
       - name: Install pypa/build
         run: >-
           python -m

From 9bcc952d343626854782046a8fc624973ff0a17c Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:48:15 +0100
Subject: [PATCH 13/33] Fix dummy value for package version

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index ee7b39e0c..c8a0e2524 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,7 +45,7 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version ${{ 0.0.1 }}
+        run: python ./platomo-build/build.py --package_version 0.0.1
       - name: Install pypa/build
         run: >-
           python -m

From 24e2085a39fb20c2ad9df3d267c7625cd869aa4d Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:09:55 +0100
Subject: [PATCH 14/33] Clear dist folder

---
 .github/workflows/publish-testpypi.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index c8a0e2524..01c6146fb 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -46,6 +46,10 @@ jobs:
           fi
       - name: Build release assets
         run: python ./platomo-build/build.py --package_version 0.0.1
+      - name: Remove File
+        uses: JesseTG/rm@v1.0.3
+        with:
+          path: dist/
       - name: Install pypa/build
         run: >-
           python -m

From 7059e3b2f1981a2b89437a734acdedbe686e9130 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:14:25 +0100
Subject: [PATCH 15/33] Add workflow name

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 01c6146fb..f4a4b5332 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -1,7 +1,7 @@
 ---
 # This workflow will install Python dependencies, run tests
 
-name: Run CI/CD
+name: Publish on TestPyPI
 
 on: push
 

From 023d7c8699c0f05eb2c710df35cf8d8781b6f86a Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:16:55 +0100
Subject: [PATCH 16/33] Bump version number

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index f4a4b5332..213319c2e 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,7 +45,7 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.1
+        run: python ./platomo-build/build.py --package_version 0.1.1
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 9d2a602379f9d1a3341a1c5b9168d13736ec639a Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:23:48 +0100
Subject: [PATCH 17/33] Log dist content

---
 .github/workflows/publish-testpypi.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 213319c2e..f4a665fe1 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,7 +45,7 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.1.1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.5-test-1
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:
@@ -64,6 +64,8 @@ jobs:
           --wheel
           --outdir dist/
           .
+      - name: Show dist content
+        run: ls -ahl dist/
       - name: Publish package distributions to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

From 705ce695283120c6d9c8d56550807f15fbaad74d Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:26:09 +0100
Subject: [PATCH 18/33] Add more debug logs

---
 .github/workflows/publish-testpypi.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index f4a665fe1..e05f04e95 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -46,6 +46,10 @@ jobs:
           fi
       - name: Build release assets
         run: python ./platomo-build/build.py --package_version 0.0.0.0.5-test-1
+      - name: Show dist content
+        run: ls -ahl dist/
+      - name: Display version info
+        run: cat OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 14f2286de58de8fe196db0581c229b793e87de16 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:38:12 +0100
Subject: [PATCH 19/33] Manually patch version file

---
 .github/workflows/publish-testpypi.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index e05f04e95..8f01ea791 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -50,6 +50,8 @@ jobs:
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
+      - name: Display version info
+        run: echo __version__ = \"0.0.1-Test-1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 130d63e48674303028e8419bfe68bc190b7952d8 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:41:11 +0100
Subject: [PATCH 20/33] Choose correct version matching version scheme

---
 OTAnalytics/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OTAnalytics/version.py b/OTAnalytics/version.py
index 76fe15da5..3237807c6 100644
--- a/OTAnalytics/version.py
+++ b/OTAnalytics/version.py
@@ -1 +1 @@
-__version__ = "0.0"
+__version__ = "0.0.1-Test-1"

From b674f1b9ef208b84830b77e57a5a77f0c3a86cf0 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:42:58 +0100
Subject: [PATCH 21/33] Choose correct version matching version scheme

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 OTAnalytics/version.py                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 8f01ea791..5b9452d8d 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,8 +45,8 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.5-test-1
-      - name: Show dist content
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.5.a1
+      - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
diff --git a/OTAnalytics/version.py b/OTAnalytics/version.py
index 3237807c6..76fe15da5 100644
--- a/OTAnalytics/version.py
+++ b/OTAnalytics/version.py
@@ -1 +1 @@
-__version__ = "0.0.1-Test-1"
+__version__ = "0.0"

From 09600ed7ba99fda341761b2c2fcc405b39f7d6f2 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:45:28 +0100
Subject: [PATCH 22/33] Fix patching version number

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 5b9452d8d..23e15196a 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Display version info
-        run: echo __version__ = \"0.0.1-Test-1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.5.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 94a8228cb0475589177a7341110a781e949d20f2 Mon Sep 17 00:00:00 2001
From: Randy Seng <19281702+randy-seng@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:55:54 +0100
Subject: [PATCH 23/33] Give meaningful name for workflow step

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 23e15196a..85ef679b1 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -50,7 +50,7 @@ jobs:
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
-      - name: Display version info
+      - name: Patch version
         run: echo __version__ = \"0.0.0.0.5.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3

From 67a50b0a0f3a1224bfe3dc53ca66a29705a6c389 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Wed, 3 Apr 2024 16:51:06 +0200
Subject: [PATCH 24/33] Increase version number to get latest OTAnalytics

---
 .github/workflows/publish-testpypi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 85ef679b1..8c538c9fd 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.5.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.6.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 8a1ff275fd5e9a2d53ca7fbe1b44b4fa4b056e58 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Tue, 16 Apr 2024 16:12:45 +0200
Subject: [PATCH 25/33] Increase version for new release on test.pypi.org

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 8c538c9fd..b4699819f 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.5.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.7.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.6.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.7.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 3db58d3f0f307fb3f158c6448c45f622dd3249f2 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Wed, 24 Apr 2024 11:57:31 +0200
Subject: [PATCH 26/33] Update to latest OTAnalytics

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index b4699819f..deacdf724 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.7.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.8.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.7.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.8.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 8b4ec254913dd8bf9eb403a725997c7ff203bdd1 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Tue, 30 Apr 2024 20:00:11 +0200
Subject: [PATCH 27/33] Increase version

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index deacdf724..19eb0180f 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.8.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.10.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.8.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.10.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 415f4815240313758b456dc858759c3f640e20ee Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Thu, 2 May 2024 08:22:57 +0200
Subject: [PATCH 28/33] Clean up code and add tests

---
 OTAnalytics/plugin_filter/dataframe_filter.py          |  2 --
 .../OTAnalytics/plugin_filter/test_dataframe_filter.py | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/OTAnalytics/plugin_filter/dataframe_filter.py b/OTAnalytics/plugin_filter/dataframe_filter.py
index 0d6e76e92..834c6c62b 100644
--- a/OTAnalytics/plugin_filter/dataframe_filter.py
+++ b/OTAnalytics/plugin_filter/dataframe_filter.py
@@ -207,7 +207,6 @@ def add_starts_at_or_after_date_predicate(self, start_date: datetime) -> None:
             DataFrameStartsAtOrAfterFrame(
                 track.FRAME, self._current_frame.get_frame_number_for(start_date)
             )
-            # DataFrameStartsAtOrAfterDate(self._occurrence_column, start_date)
         )
 
     def add_ends_before_or_at_date_predicate(self, end_date: datetime) -> None:
@@ -218,7 +217,6 @@ def add_ends_before_or_at_date_predicate(self, end_date: datetime) -> None:
             DataFrameEndsBeforeOrAtFrame(
                 track.FRAME, self._current_frame.get_frame_number_for(end_date)
             )
-            # DataFrameEndsBeforeOrAtDate(self._occurrence_column, end_date)
         )
 
     def set_classification_column(self, classification_name: str) -> None:
diff --git a/tests/OTAnalytics/plugin_filter/test_dataframe_filter.py b/tests/OTAnalytics/plugin_filter/test_dataframe_filter.py
index 3c7a1c1a8..72892d2fd 100644
--- a/tests/OTAnalytics/plugin_filter/test_dataframe_filter.py
+++ b/tests/OTAnalytics/plugin_filter/test_dataframe_filter.py
@@ -7,7 +7,7 @@
 
 from OTAnalytics.application.plotting import GetCurrentFrame
 from OTAnalytics.domain import track
-from OTAnalytics.domain.track import CLASSIFICATION, OCCURRENCE, Detection, Track
+from OTAnalytics.domain.track import CLASSIFICATION, FRAME, OCCURRENCE, Detection, Track
 from OTAnalytics.plugin_filter.dataframe_filter import (
     DataFrameEndsBeforeOrAtDate,
     DataFrameEndsBeforeOrAtFrame,
@@ -92,6 +92,14 @@ class TestDataFramePredicates:
                 ),
                 [False, False, False, False, False],
             ),
+            (
+                DataFrameStartsAtOrAfterFrame(FRAME, 0),
+                [True, True, True, True, True],
+            ),
+            (
+                DataFrameStartsAtOrAfterFrame(FRAME, 10),
+                [False, False, False, False, False],
+            ),
             (
                 DataFrameHasClassifications(CLASSIFICATION, {"car", "truck"}),
                 [True, True, True, True, True],

From 5832e6cfdffad23380505f1febc9aaf9f98563c3 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Thu, 2 May 2024 08:23:47 +0200
Subject: [PATCH 29/33] Clean up code

---
 OTAnalytics/domain/video.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/OTAnalytics/domain/video.py b/OTAnalytics/domain/video.py
index 2ae3c4a56..f4c147cf7 100644
--- a/OTAnalytics/domain/video.py
+++ b/OTAnalytics/domain/video.py
@@ -112,8 +112,6 @@ def duration(self) -> timedelta:
 
     @property
     def fps(self) -> float:
-        # if self.actual_fps:
-        #     return self.actual_fps
         return self.recorded_fps
 
     def to_dict(self) -> dict:
@@ -158,12 +156,7 @@ def start_date(self) -> Optional[datetime]:
 
     @property
     def fps(self) -> float:
-        return (
-            # self.metadata.actual_fps
-            # if self.metadata and self.metadata.actual_fps
-            # else
-            self.video_reader.get_fps(self.path)
-        )
+        return self.video_reader.get_fps(self.path)
 
     def __post_init__(self) -> None:
         self.check_path_exists()

From 6a658c58a381921c914a14b44bfbea0c72220ad2 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Thu, 2 May 2024 08:29:41 +0200
Subject: [PATCH 30/33] Use correct frame offset.

---
 OTAnalytics/plugin_prototypes/track_visualization/track_viz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OTAnalytics/plugin_prototypes/track_visualization/track_viz.py b/OTAnalytics/plugin_prototypes/track_visualization/track_viz.py
index 23489419d..7224ef652 100644
--- a/OTAnalytics/plugin_prototypes/track_visualization/track_viz.py
+++ b/OTAnalytics/plugin_prototypes/track_visualization/track_viz.py
@@ -57,7 +57,7 @@
 from OTAnalytics.plugin_filter.dataframe_filter import DataFrameFilterBuilder
 
 """Frames start with 1 in OTVision but frames of videos are loaded zero based."""
-FRAME_OFFSET = 0
+FRAME_OFFSET = 1
 
 ENCODING = "UTF-8"
 DPI = 100

From 6350f6bd0c2f20c5da978c54f565e05677feeb8e Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Tue, 7 May 2024 15:31:33 +0200
Subject: [PATCH 31/33] Increase version number for latest bug fixes

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 19eb0180f..d88b0ab42 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.10.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.11.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.10.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.11.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From b6979d3c7f9c160d959477b0b22a4899d703510b Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Tue, 7 May 2024 16:20:33 +0200
Subject: [PATCH 32/33] Update version number

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index d88b0ab42..8c29a923e 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.11.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.12.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.11.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.12.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with:

From 8023c3f7a82e2c0cb2a6f0353e3e1a722a2f2979 Mon Sep 17 00:00:00 2001
From: Lars Briem <lars.briem@platomo.de>
Date: Wed, 8 May 2024 10:00:22 +0200
Subject: [PATCH 33/33] Update version number

---
 .github/workflows/publish-testpypi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
index 8c29a923e..082a4feb7 100644
--- a/.github/workflows/publish-testpypi.yml
+++ b/.github/workflows/publish-testpypi.yml
@@ -45,13 +45,13 @@ jobs:
               pip install -r requirements-dev.txt
           fi
       - name: Build release assets
-        run: python ./platomo-build/build.py --package_version 0.0.0.0.12.a1
+        run: python ./platomo-build/build.py --package_version 0.0.0.0.13.a1
       - name: Display dist content
         run: ls -ahl dist/
       - name: Display version info
         run: cat OTAnalytics/version.py
       - name: Patch version
-        run: echo __version__ = \"0.0.0.0.12.a1\" > OTAnalytics/version.py
+        run: echo __version__ = \"0.0.0.0.13.a1\" > OTAnalytics/version.py
       - name: Remove File
         uses: JesseTG/rm@v1.0.3
         with: