Skip to content

Commit a2920c8

Browse files
committed
Use suffix .dev0 for the main development branch
1 parent 7c7c270 commit a2920c8

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

dev_tools/packaging/generate-dev-version-id.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ PROJECT_NAME=cirq-core/cirq
4444
ACTUAL_VERSION_LINE=$(tail -n 1 "${PROJECT_NAME}/_version.py")
4545
ACTUAL_VERSION=$(echo "$ACTUAL_VERSION_LINE" | cut -d'"' -f 2)
4646

47-
if [[ ${ACTUAL_VERSION} == *"dev" ]]; then
48-
echo "${ACTUAL_VERSION}$(date "+%Y%m%d%H%M%S")"
47+
if [[ ${ACTUAL_VERSION} == *"dev0" ]]; then
48+
echo "${ACTUAL_VERSION%0}$(date "+%Y%m%d%H%M%S")"
4949
else
50-
echo "Version doesn't end in dev: ${ACTUAL_VERSION_LINE}" >&2
50+
echo "Version doesn't end in dev0: ${ACTUAL_VERSION_LINE}" >&2
5151
exit 1
5252
fi

release.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ numbers. The following guarantees are provided:
2121
ever becomes necessary to allow packages to have different version numbers,
2222
this policy will be updated.)
2323

24-
1. Libraries in the `cirq-core` directory (with the exception of
24+
2. Libraries in the `cirq-core` directory (with the exception of
2525
`cirq-core/cirq/contrib`) adhere to the guarantees outlined in the Semantic
2626
Versioning specification. In summary:
2727

@@ -34,14 +34,14 @@ numbers. The following guarantees are provided:
3434
* Additions and/or changes that affect the API in a
3535
backwards-_incompatible_ way will increment the MAJOR version.
3636

37-
1. The contrib directory (at `cirq-core/cirq/contrib`) currently follows
37+
3. The contrib directory (at `cirq-core/cirq/contrib`) currently follows
3838
Semantic Versioning except for the MINOR version increment policy: releases
3939
with MINOR version increments may contain backward-incompatible
4040
functionality changes to its public API. (They may be changed to strictly
4141
follow Semantic Versioning in the future, at which point this policy will
4242
be updated.)
4343

44-
1. Cirq vendor directories (`cirq-aqt`, `cirq-google`, `cirq-ionq`, etc.) follow
44+
4. Cirq vendor directories (`cirq-aqt`, `cirq-google`, `cirq-ionq`, etc.) follow
4545
Semantic Versioning except the MINOR version increment policy: each vendor
4646
directory has a separate policy on whether MINOR version increments provide
4747
backward-compatibility guarantees, as described in `version_policy.md` in the
@@ -54,7 +54,7 @@ numbers. The following guarantees are provided:
5454
1. For each vendor directory, version policies may be modified to strictly
5555
follow Semantic Versioning in the future.
5656

57-
1. Versions based on unreleased branches of `main` will be suffixed with `.dev`.
57+
5. Versions based on unreleased branches of `main` will be suffixed with `.dev0`.
5858

5959
The rules for version changes are:
6060

@@ -76,7 +76,7 @@ We use GitHub's release system for creating releases. Release are listed
7676

7777
Our development process uses the branch named `main` for development. This
7878
branch will always use the next unreleased minor version number with the suffix
79-
of `.dev`. When a release is performed, the `.dev` will be removed and tagged
79+
of `.dev0`. When a release is performed, the `.dev0` will be removed and tagged
8080
in a release branch with a version tag (vX.X.X). Then, `main` will be updated
8181
to the next minor version. The version number of `main` can always be found in
8282
the [version file](./cirq-core/cirq/_version.py).
@@ -158,9 +158,9 @@ git cherry-pick <commit>
158158
Bump the version number on the release branch:
159159

160160
```bash
161-
python dev_tools/modules.py replace_version --old ${VER}.dev --new ${VER}
161+
python dev_tools/modules.py replace_version --old ${VER}.dev0 --new ${VER}
162162
git add .
163-
git commit -m "Removing ${VER}.dev -> ${VER}"
163+
git commit -m "Removing ${VER}.dev0 -> ${VER}"
164164
git push origin "v${VER}-dev"
165165
```
166166

@@ -171,7 +171,7 @@ updates, leave it as it is.
171171

172172
```bash
173173
git checkout main -b "version_bump_${NEXT_VER}"
174-
python dev_tools/modules.py replace_version --old ${VER}.dev --new ${NEXT_VER}.dev
174+
python dev_tools/modules.py replace_version --old ${VER}.dev0 --new ${NEXT_VER}.dev0
175175
git add .
176176
git commit -m "Bump cirq version to ${NEXT_VER}"
177177
git push origin "version_bump_${NEXT_VER}"

0 commit comments

Comments
 (0)