photon-skills 3.0.5.dev0__tar.gz → 3.0.5.dev94__tar.gz

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/.github/workflows/publish.yml

@@ -69,3 +69,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           attestations: true
+          # Re-running a job for the same commit must be a no-op, not a red X:
+          # PyPI refuses a filename it has already stored. Stable tags stay
+          # strict, so a genuinely broken release still fails loudly.
+          skip-existing: ${{ github.ref_type != 'tag' }}

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/CHANGELOG.md

@@ -6,6 +6,17 @@ The project follows a pragmatic release-note style rather than claiming strict s
 
 ## [Unreleased]
 
+### Fixed
+
+- **Dev pre-release versions no longer collide on PyPI.** `release.py --ci-dev` counted
+  commits *since the last tag*; when a release commit lands on top of a merge and the tag is
+  moved onto HEAD, that count resets to 0 and regenerates a version PyPI already stores, so
+  every master push went red with "File already exists". The counter is now the total commit
+  count, and the dev publish step uses `skip-existing` so a re-run of the same commit is a
+  no-op; tag publishes stay strict.
+
+## [3.0.4] - 2026-10-31
+
 ### Changed
 
 - **New brand mark.** The inherited Light Skills icon (crescent + spire + network, blue/violet

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: photon-skills
-Version: 3.0.5.dev0
+Version: 3.0.5.dev94
 Summary: Photon — STEAM research, debate, and pitch competition companion for primary/secondary students
 Author-email: Uniterra Solutions Limited <harryw07801@uniterra-solutions.com>
 License-Expression: MIT

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "photon-skills"
-version = "3.0.5.dev0"
+version = "3.0.5.dev94"
 description = "Photon — STEAM research, debate, and pitch competition companion for primary/secondary students"
 authors = [
     { name = "Uniterra Solutions Limited", email = "harryw07801@uniterra-solutions.com" },

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/scripts/release.py

@@ -112,22 +112,22 @@ def git(*args: str) -> str:
 def ci_dev_version() -> str:
     """Compute the dev pre-release version for main-branch CI.
 
-    ``<next patch after last tag>.dev<commits since that tag>`` — e.g. last
-    tag v2.0.0 with 3 commits after it → ``2.0.1.dev3``. Falls back to the
-    current pyproject version (and total commit count) when no tag exists.
-    pip ignores pre-releases unless ``--pre``, so stable installs are
-    unaffected by these.
+    ``<next patch after last tag>.dev<total commit count>`` — e.g. last tag
+    v2.0.0 with 41 commits in the repo → ``2.0.1.dev41``. pip ignores
+    pre-releases unless ``--pre``, so stable installs are unaffected.
+
+    The counter is the total commit count, not the count since the last tag:
+    when a tag is moved onto HEAD (a release commit on top of a merge) the
+    since-tag count resets to 0, which regenerates a version that PyPI has
+    already seen and the upload fails with "File already exists". Total
+    commits only ever increases, so each push gets a fresh dev version.
     """
     try:
         last_tag = git("describe", "--tags", "--abbrev=0")
     except subprocess.CalledProcessError:
         last_tag = ""
-    if last_tag:
-        base = last_tag.lstrip("v")
-        count = git("rev-list", "--count", f"{last_tag}..HEAD")
-    else:
-        base = read_version(PYPROJECT)
-        count = git("rev-list", "--count", "HEAD")
+    base = last_tag.lstrip("v") if last_tag else read_version(PYPROJECT)
+    count = git("rev-list", "--count", "HEAD")
     return f"{bump(base, 'patch')}.dev{count}"
 
 

{photon_skills-3.0.5.dev0 → photon_skills-3.0.5.dev94}/src/photon/plugin.yaml

@@ -1,5 +1,5 @@
 name: photon-skills
-version: 3.0.5.dev0
+version: 3.0.5.dev94
 description: >-
   Photon — STEAM project companion for students: research workflow, debate and
   symposium coaching, pitch preparation, and a git-backed project workspace.