Skip to content

Commit 9c83bdb

Browse files
ReimarBauermatrss
andauthored
prepare v11.0.0 (#3023)
--------- Co-authored-by: Matthias Riße <[email protected]>
1 parent 548816f commit 9c83bdb

File tree

4 files changed

+52
-25
lines changed

4 files changed

+52
-25
lines changed

CHANGES.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Changelog
22
=========
33

4+
Version 11.0.0
5+
~~~~~~~~~~~~~~
6+
7+
This is primarily a refactoring release.
8+
9+
Reimar Bauer has removed our dependency on the pyfilesystem2 (fs) library, replacing it with Pathlib and os.path.
10+
Matthias Riße and Reimar Bauer have improved the stability of our test setup.
11+
The generation of demo data has been unified, and various deprecations have been resolved.
12+
13+
All changes:
14+
https://github.com/Open-MSS/MSS/milestone/107?closed=1
15+
416
Version 10.2.1
517
~~~~~~~~~~~~~~
618

docs/development.rst

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ This chapter will get you started with MSS development.
77

88
MSS is written in Python.
99

10-
Once a stable release is published we do only bug fixes in stable and release regularly
11-
new minor versions. If a fix needs a API change or it is likely more a new feature you have
12-
to make a pull request to the develop branch. Documentation of changes is done by using our
13-
`issue tracker <https://github.com/Open-MSS/MSS/issues>`_.
10+
Development work is exclusively performed on the **develop** branch.
11+
Bug fixes are backported to the `stable` branch whenever feasible.
12+
If a bug fix cannot be backported, corresponding updates will be made to the develop branch.
13+
We release new minor versions on a regular basis.
14+
New features should be submitted as pull requests against the develop branch.
15+
Changes and documentation are managed through our `issue tracker <https://github.com/Open-MSS/MSS/issues>`__.
1416

1517
When it is ready the developer version becomes the next stable.
1618

17-
1819
The stable version of MSS is tracked on `BLACK DUCK Open Hub <https://www.openhub.net/p/mss>`_
1920

2021

@@ -456,35 +457,43 @@ After filling the template completely click on Pull request
456457

457458

458459

459-
Merging stable into develop
460-
---------------------------
460+
Creating a new minor, patch level release
461+
-----------------------------------------
461462

462-
Bug fixes we have done in stable we need to merge regularly into develop too::
463+
The stable branch will only receive critical bug fixes, and security patches. These patches must either address a bug that is only present on stable, be a backport of a patch that was already merged into develop, or there must simultaneously be a PR addressing the same issue on develop.
463464

464-
git checkout stable
465-
git pull [email protected]:Open-MSS/MSS.git stable
466-
git checkout develop
467-
git pull [email protected]:Open-MSS/MSS.git develop
468-
git checkout -b merge_stable_to_develop
469-
git merge stable
470-
git push [email protected]:Open-MSS/MSS.git merge_stable_to_develop
465+
We will review changes for both branches when there is no backport from develop possible.
471466

467+
For a new minor/patch release
472468

473-
Then create the proposed merge request. The merge request must *not* be squashed or rebased.
474-
To allow the merging, the requirement for a linear-history must be disabled *temporarily*
475-
for the develop branch and one needs to ensure that the merge request is accepted with a
476-
regular merge with merge commit. Remove the merge_stable_to_develop branch if still present.
469+
* make sure all issues for this milestone are closed or moved to the next milestone
470+
* update CHANGES.rst, based on git log
471+
* check version number of upcoming release in pyproject.toml
472+
* verify that pyproject.toml, MANIFEST.in are complete
473+
* Update the version in the lock file by `pixi lock`
474+
* tag the release::
477475

476+
git tag -s -m "tagged/signed release X.Y.Z" X.Y.Z
477+
git push origin X.Y.Z
478+
479+
* write a release information on https://github.com/Open-MSS/MSS/releases
480+
* create a release on anaconda conda-forge
481+
* announce on:
482+
483+
* Mailing list
484+
* Mastodon (follow https://fosstodon.org/@MSS)
478485

479-
Creating a new release
480-
----------------------
486+
487+
488+
Creating a new major release
489+
----------------------------
481490

482491
* make sure all issues for this milestone are closed or moved to the next milestone
483492
* update CHANGES.rst, based on git log
484493
* check version number of upcoming release in pyproject.toml
485494
* verify that pyproject.toml, MANIFEST.in are complete
486495
* Update the version in the lock file by `pixi lock`
487-
* for a new stable release merge from develop to stable
496+
* for a new major release rename the existing stable branch to oldstable and recreate it from the develop branch
488497
* tag the release::
489498

490499
git tag -s -m "tagged/signed release X.Y.Z" X.Y.Z
@@ -519,6 +528,12 @@ MSS takes part in `Google Summer of Code <https://summerofcode.withgoogle.com/>`
519528
as a `sub-organization of Python Software Foundation (PSF) <https://python-gsoc.org/>`_.
520529

521530

531+
GSoC'25 Projects
532+
................
533+
534+
- `Annapurna Gupta: Mission support system : View Layout and Storing : GSOC2025 <https://github.com/Open-MSS/MSS/wiki/Annapurna-Gupta:-Mission-support-system-:-View-Layout-and-Storing-:-GSOC2025>`_
535+
536+
522537
GSoC'24 Projects
523538
................
524539

pixi.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "open-mss"
3-
version = "10.2.1"
3+
version = "11.0.0"
44
description = "MSS - Mission Support System"
55
readme = "README.md"
66
classifiers = [

0 commit comments

Comments
 (0)