You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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>`__.
14
16
15
17
When it is ready the developer version becomes the next stable.
16
18
17
-
18
19
The stable version of MSS is tracked on `BLACK DUCK Open Hub <https://www.openhub.net/p/mss>`_
19
20
20
21
@@ -456,35 +457,43 @@ After filling the template completely click on Pull request
456
457
457
458
458
459
459
-
Merging stable into develop
460
-
---------------------------
460
+
Creating a new minor, patch level release
461
+
-----------------------------------------
461
462
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.
We will review changes for both branches when there is no backport from develop possible.
471
466
467
+
For a new minor/patch release
472
468
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::
477
475
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)
478
485
479
-
Creating a new release
480
-
----------------------
486
+
487
+
488
+
Creating a new major release
489
+
----------------------------
481
490
482
491
* make sure all issues for this milestone are closed or moved to the next milestone
483
492
* update CHANGES.rst, based on git log
484
493
* check version number of upcoming release in pyproject.toml
485
494
* verify that pyproject.toml, MANIFEST.in are complete
486
495
* 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
488
497
* tag the release::
489
498
490
499
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/>`
519
528
as a `sub-organization of Python Software Foundation (PSF) <https://python-gsoc.org/>`_.
520
529
521
530
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>`_
0 commit comments