From b88099a799e1817d803ce01e485d4591bf1561f2 Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Fri, 11 Sep 2026 16:52:33 +0200 Subject: [PATCH] release: v3.6.0.0 Bump the version from 3.6.0.0rc1 to the final 3.6.0.0 and close the changelog section for it. Drop the develop branch from the branch model; the repository moves to a trunk based flow where feature branches are cut from main and merged back into it. --- CHANGELOG.md | 5 +++++ CONTRIBUTING.md | 10 +++++----- pyproject.toml | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c269c4..45dfee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ Pre-releases (`b*`, `rc*`) are not listed. ## [Unreleased] +## [3.6.0.0] - 2026-09-11 + +Compiled against cuvis SDK 3.6.0. + ### Added - `CI` - `.github/workflows/release.yml` is driven by `v*.*.*.*` tags: it validates the tag against `pyproject.toml`, this file and the `cuvis_base` images, builds the wheels, publishes to TestPyPI and PyPI, pushes the `cubertgmbh/cuvis_pyil` images, and creates a GitHub Release with the matching section here as notes. @@ -34,6 +38,7 @@ Pre-releases (`b*`, `rc*`) are not listed. ### Changed +- `CONTRIBUTING.md` - the branch model is now trunk based: `develop` is gone, every change is cut from `main` and merged back into it by pull request, and a commit on `main` is no longer necessarily a release. - One Linux wheel per Python version and architecture, built on the oldest Ubuntu that has a `cuvis_base` image, instead of one per Ubuntu release. A `manylinux` tag states a minimum glibc, so the 22.04 build already served 24.04 and 26.04; the second wheel only ever duplicated it. - The platform tag now comes from `auditwheel`, which derives it from the symbols the extension references and fails the build when they outgrow the tag, instead of being stamped from the build container. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7626647..02f244b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,12 +7,12 @@ For bug reports and questions use [GitHub Issues](https://github.com/cubert-hype | Branch | Role | | --- | --- | -| `main` | The latest released interface layer for the latest released cuvis SDK. Every commit on `main` is a release and carries a `v*` tag. Never receives direct pushes. | -| `develop` | Integration branch for the next release. All feature work lands here. | -| `feature/*` | One branch per change, cut from `develop`, merged back into `develop` by pull request. | -| `hotfix/*` | Cut from `main` when a released version needs a fix before `develop` is ready to release. Merged into `main` by pull request, tagged, then merged back into `develop`. | +| `main` | Trunk, and the latest released interface layer for the latest released cuvis SDK. Never receives direct pushes. | +| `feature/*` | One branch per change, cut from `main`, merged back into `main` by pull request. | -A pull request into `develop` or `main` must pass the `ci.yml` build and changelog jobs. +A release is a `v*` tag on a commit of `main`; not every commit on `main` is a release. + +A pull request into `main` must pass the `ci.yml` build and changelog jobs. ## Version scheme diff --git a/pyproject.toml b/pyproject.toml index 7e536e7..9f8d52a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "cuvis_il" -version = "3.6.0.0rc1" +version = "3.6.0.0" description = "Compiled Python Bindings for the CUVIS SDK." readme = "README.md" requires-python = ">=3.10"