diff --git a/doc/developer_documentation.md b/doc/developer_documentation.md index 59881ecd0..0478f89c0 100644 --- a/doc/developer_documentation.md +++ b/doc/developer_documentation.md @@ -68,10 +68,7 @@ A *spandrel* is an implementation detail that has observable effects, but which - Create an off-main-branch release commit - [ ] `git checkout main -b SOMEBRANCHNAME` - - [ ] Update version to `version = 'X.Y.0'` in `setup.py` (at repo root) - - [ ] Update version to `version = 'X.Y.0'` in `glue/cirq/setup.py` - - [ ] Update version to `version = 'X.Y.0'` in `glue/sinter/setup.py` - - [ ] Update version to `version = 'X.Y.0'` in `glue/stimzx/setup.py` + - [ ] Global search replace `__version__ = 'X.Y.dev0'` with `__version__ = 'X.Y.0'` - [ ] `git commit -a -m "Bump to vX.Y.0"` - [ ] `git tag vX.Y.0` - [ ] Push tag to github @@ -79,11 +76,10 @@ A *spandrel* is an implementation detail that has observable effects, but which - [ ] Wait for ci to finish validating and producing artifacts for the tag - [ ] Get `stim`, `stimcirq`, and `sinter` wheels/sdists [from cibuildwheels](#pypackage.stim.cibuildwheels) of this tag - Bump to next dev version on main branch - - [ ] Update version to `version = 'X.(Y+1).dev0'` in `setup.py` (at repo root) - - [ ] Update version to `version = 'X.(Y+1).dev0'` in `glue/cirq/setup.py` - - [ ] Update version to `version = 'X.(Y+1).dev0'` in `glue/sinter/setup.py` - - [ ] Update version to `version = 'X.(Y+1).dev0'` in `glue/stimzx/setup.py` - - [ ] Update `INTENTIONAL_VERSION_SEED_INCOMPATIBILITY` in `src/stim/circuit/circuit.h` + - [ ] `git checkout main -b SOMEBRANCHNAME` + - [ ] Global search replace `__version__ = 'X.Y.dev0'` with `__version__ = 'X.(Y+1).dev0'` + - [ ] Increment `INTENTIONAL_VERSION_SEED_INCOMPATIBILITY` in `src/stim/circuit/circuit.h` + - [ ] `git commit -a -m "Start vX.(Y+1).dev"` - [ ] Push to github as a branch and merge into main using a pull request - Write release notes on github - [ ] In title, use two-word theming of most important changes diff --git a/glue/cirq/setup.py b/glue/cirq/setup.py index c47fa1b59..882e1f440 100644 --- a/glue/cirq/setup.py +++ b/glue/cirq/setup.py @@ -17,7 +17,7 @@ with open('README.md', encoding='UTF-8') as f: long_description = f.read() -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' setup( name='stimcirq', diff --git a/glue/cirq/stimcirq/__init__.py b/glue/cirq/stimcirq/__init__.py index ce9f8cbae..81f3b68ac 100644 --- a/glue/cirq/stimcirq/__init__.py +++ b/glue/cirq/stimcirq/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' from ._cirq_to_stim import cirq_circuit_to_stim_circuit from ._cx_swap_gate import CXSwapGate from ._cz_swap_gate import CZSwapGate diff --git a/glue/sample/setup.py b/glue/sample/setup.py index 26df217bd..1a869933b 100644 --- a/glue/sample/setup.py +++ b/glue/sample/setup.py @@ -19,7 +19,7 @@ with open('requirements.txt', encoding='UTF-8') as f: requirements = f.read().splitlines() -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' setup( name='sinter', diff --git a/glue/sample/src/sinter/__init__.py b/glue/sample/src/sinter/__init__.py index a8ccc6788..cf754d752 100644 --- a/glue/sample/src/sinter/__init__.py +++ b/glue/sample/src/sinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' from sinter._collection import ( collect, diff --git a/glue/zx/setup.py b/glue/zx/setup.py index b1905199a..0ee8ae501 100644 --- a/glue/zx/setup.py +++ b/glue/zx/setup.py @@ -17,7 +17,7 @@ with open('README.md', encoding='UTF-8') as f: long_description = f.read() -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' setup( name='stimzx', diff --git a/glue/zx/stimzx/__init__.py b/glue/zx/stimzx/__init__.py index dfb5cc88e..77bc39775 100644 --- a/glue/zx/stimzx/__init__.py +++ b/glue/zx/stimzx/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' from ._external_stabilizer import ( ExternalStabilizer, ) diff --git a/setup.py b/setup.py index 6efc9648c..23eff515d 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ HEADER_FILES = glob.glob("src/**/*.h", recursive=True) + glob.glob("src/**/*.inl", recursive=True) RELEVANT_SOURCE_FILES = sorted(set(ALL_SOURCE_FILES) - set(TEST_FILES + PERF_FILES + MAIN_FILES + MUX_SOURCE_FILES)) -__version__ = '1.14.dev0' +__version__ = '1.15.dev0' if platform.system().startswith('Win'): common_compile_args = [ diff --git a/src/stim/util_bot/probability_util.h b/src/stim/util_bot/probability_util.h index b338ba50d..47306d420 100644 --- a/src/stim/util_bot/probability_util.h +++ b/src/stim/util_bot/probability_util.h @@ -26,7 +26,7 @@ namespace stim { // Change this number from time to time to ensure people don't rely on seeds across versions. -constexpr uint64_t INTENTIONAL_VERSION_SEED_INCOMPATIBILITY = 0xDEADBEEF123BULL; +constexpr uint64_t INTENTIONAL_VERSION_SEED_INCOMPATIBILITY = 0xDEADBEEF124BULL; /// Yields the indices of hits sampled from a Bernoulli distribution. /// Gets more efficient as the hit probability drops.