flowtracks 1.6.0__tar.gz → 1.6.1.dev1__tar.gz

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/.github/workflows/python-package.yml

@@ -18,9 +18,9 @@ jobs:
         python-version: ["3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/.github/workflows/python-publish.yml

@@ -26,8 +26,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - name: Test and lint
@@ -41,12 +41,14 @@ jobs:
   release-build:
     runs-on: ubuntu-latest
     needs: test
+    outputs:
+      is_dev: ${{ steps.check.outputs.is_dev }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0          # setuptools-scm derives the version from tags
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -56,16 +58,31 @@ jobs:
           python -m build
 
       - name: Check the version
+        id: check
         run: |
           VERSION=$(ls dist/*.whl | sed -E 's/.*flowtracks-([^-]+)-.*/\1/')
           echo "Built version: $VERSION"
+          echo "is_dev=false" >> "$GITHUB_OUTPUT"
           if [ "${{ github.event_name }}" = "release" ]; then
             # a release must build exactly its tag's version (v1.2.2 -> 1.2.2)
             if [ "$VERSION" != "${GITHUB_REF#refs/tags/v}" ]; then
               echo "Error: tag ${GITHUB_REF#refs/tags/} builds $VERSION"; exit 1
             fi
           else
-            case "$VERSION" in *.dev*) ;; *) echo "Error: $VERSION is not a dev version"; exit 1 ;; esac
+            case "$VERSION" in
+              *.dev*) echo "is_dev=true" >> "$GITHUB_OUTPUT" ;;
+              *)
+                # A push build can see a freshly created tag on HEAD (tagging
+                # master HEAD for a release races this workflow). That commit
+                # is published by the release event, not here: pass the gate
+                # but skip PyPI below instead of failing the run.
+                if git describe --exact-match HEAD >/dev/null 2>&1; then
+                  echo "HEAD is tagged ($(git describe --exact-match HEAD)); release event handles publishing"
+                else
+                  echo "Error: $VERSION is not a dev version"; exit 1
+                fi
+                ;;
+            esac
           fi
 
       - name: Upload distributions
@@ -75,6 +92,9 @@ jobs:
           path: dist/
 
   pypi-publish:
+    # On push of a tagged commit (tag/release racing this workflow) there is
+    # nothing to publish here -- the release event publishes it.
+    if: github.event_name == 'release' || needs.release-build.outputs.is_dev == 'true'
     runs-on: ubuntu-latest
     needs:
       - release-build

{flowtracks-1.6.0/flowtracks.egg-info → flowtracks-1.6.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowtracks
-Version: 1.6.0
+Version: 1.6.1.dev1
 Summary: Library for handling 3D PTV trajectory databases and Lagrangian/Eulerian turbulence post-processing.
 Author-email: Yosef Meller <yosefm@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/flowtracks/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.1.dev1'
+__version_tuple__ = version_tuple = (1, 6, 1, 'dev1')
 
-__commit_id__ = commit_id = 'g0098b1fd3'
+__commit_id__ = commit_id = 'g1e6b0cfe9'

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1/flowtracks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowtracks
-Version: 1.6.0
+Version: 1.6.1.dev1
 Summary: Library for handling 3D PTV trajectory databases and Lagrangian/Eulerian turbulence post-processing.
 Author-email: Yosef Meller <yosefm@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/flowtracks.egg-info/SOURCES.txt

@@ -514,6 +514,7 @@ flowtracks/zarr_scene.py
 flowtracks.egg-info/PKG-INFO
 flowtracks.egg-info/SOURCES.txt
 flowtracks.egg-info/dependency_links.txt
+flowtracks.egg-info/entry_points.txt
 flowtracks.egg-info/requires.txt
 flowtracks.egg-info/scm_file_list.json
 flowtracks.egg-info/scm_version.json

flowtracks-1.6.1.dev1/flowtracks.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+postptv-combine = flowtracks.combine:main

flowtracks-1.6.1.dev1/flowtracks.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.6.0",
+  "distance": 1,
+  "node": "g1e6b0cfe950df181cc250c67433425633bb9dfc4",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-09-30"
+}

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/pyproject.toml

@@ -30,6 +30,9 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 
+[project.scripts]
+postptv-combine = "flowtracks.combine:main"
+
 [tool.setuptools_scm]
 # vX.Y.Z tag -> X.Y.Z; N commits after it -> X.Y.(Z+1).devN. No local
 # "+g<sha>" suffix: PyPI rejects local versions, and every master push is

{flowtracks-1.6.0 → flowtracks-1.6.1.dev1}/setup.py

@@ -17,9 +17,8 @@ setup(
     packages=find_packages(),
     data_files=[('flowtracks-examples', [f for f in glob('examples/*') if os.path.isfile(f)])],
     scripts=['scripts/analyse_fhdf.py'],
-    entry_points={
-        'console_scripts': [
-            'postptv-combine = flowtracks.combine:main',
-        ],
-    },
+    # NOTE: console_scripts live in pyproject.toml [project.scripts], which
+    # setuptools treats as authoritative; defining entry_points here as well
+    # would be silently ignored (setuptools warns "`scripts` defined outside
+    # of `pyproject.toml` is ignored").
 )

flowtracks-1.6.0/flowtracks.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.6.0",
-  "distance": 0,
-  "node": "g0098b1fd3dca3e00bdbd04cf5c7505cb2f39a82e",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-29"
-}