Commit d256944c authored by William Clarke's avatar William Clarke
Browse files

Merge branch 'post_practical_feedback' into 'master'

BF: Post practical feedback

See merge request fsl/fsl_mrs!27
parents 9c6c2917 5c147bac
......@@ -28,11 +28,11 @@
# Test is run in all cases.
# Doc is only run on master branches.
# Build stages are run according to the rules associated
# with https://git.fmrib.ox.ac.uk/fsl/fsl-ci-rules
# with https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules
#
###########################################################################
include:
- project: fsl/fsl-ci-rules
- project: fsl/conda/fsl-ci-rules
file: .gitlab-ci.yml
stages:
......
This document contains the FSL-MRS release history in reverse chronological order.
1.1.9 (WIP)
-------------------------------
- Fixed typos in fsl_mrs_proc help.
- Fixed simulator bug for edited sequence coherence filters.
1.1.8 (Tuesday 5th October 2021)
-------------------------------
- Fix bug in fsl_mrsi when default MM are added to a incorrectly conjugated basis set.
......
Subproject commit 58b4ac88902abf935f096a225354c9d4eb5f6bbc
Subproject commit 0bcae16c78c43c08abea00d96848b9a9046f647f
......@@ -190,7 +190,7 @@ def main():
truncate_group.add_argument('--points', type=int, default=0,
help='Points to add/remove (+/-)')
truncate_group.add_argument('--pos', type=str, default='last',
help=" first' or 'last' (default)")
help="'first' or 'last' (default)")
truncateparser.set_defaults(func=truncate)
add_common_args(truncateparser)
......@@ -390,8 +390,7 @@ def add_common_args(p):
# ' Defaults to first (0).'
# ' Specify as indices counting from 0.')
optional.add_argument('--allreports', action="store_true",
help='Generate reports for all inputs.'
' Overrides arguments to reportIndicies.')
help='Generate reports for all inputs.')
# optional.add_argument('--conjugate', action="store_true",
# help='apply conjugate to FID')
optional.add_argument('--filename', type=str, metavar='<str>',
......
......@@ -276,7 +276,7 @@ def phase_freq_align_report(inFIDs,
line=lines['out'])
fig.add_trace(trace1, row=1, col=1)
fig.layout.xaxis.update(title_text='Transient #')
fig.layout.yaxis.update(title_text=r'$\phi$ (degrees)')
fig.layout.yaxis.update(title_text='First-order phase (degrees)')
trace2 = go.Scatter(x=np.arange(1, len(eps) + 1),
y=eps,
......@@ -405,7 +405,7 @@ def phase_freq_align_diff_report(inFIDs0,
line=lines['out'])
fig.add_trace(trace1, row=1, col=1)
fig.layout.xaxis.update(title_text='Transient #')
fig.layout.yaxis.update(title_text=r'$\phi$ (degrees)')
fig.layout.yaxis.update(title_text='First-order phase (degrees)')
trace2 = go.Scatter(x=np.arange(1, len(eps) + 1),
y=eps,
......
Instructions for releasing a new version of FSL-MRS
===================================================
1. All tests passing
2. Identify new version number
3. Update CHANGELOG.rst
4. Commit to development fork master branch (e.g. wclarke/fsl_mrs:master)
5. Initiate merge request, and merge into fsl/fsl_mrs:master
6. Create new tag -tag name should be "x.x.x" with the message "Vx.x.x". New changelog contents are copied into release notes.
7. This will trigger doc build (published [here](https://open.win.ox.ac.uk/pages/fsl/fsl_mrs/)) and package build (currently broken).
8. Pull upstream master into development fork (with tags). See help [here](https://www.atlassian.com/git/tutorials/git-forks-and-upstreams).
```git fetch upstream --tags```
```git checkout master```
```git merge upstream/master```
1. Establish feature branch in local copy of fork.
```git fetch upstream```
```git checkout -b feature upstream/master```
2. Make changes.
3. Update CHANGELOG.rst (establish new entry and version number if needed).
4. Commit and push feature branch to remote
5. Check all tests pass.
6. Merge to fsl/fsl_mrs:master.
7. Repeat with other features.
8. For new version create new tag -tag name should be "x.x.x" with the message "Vx.x.x". New changelog contents are copied into release notes.
9. This will trigger doc build (published [here](https://open.win.ox.ac.uk/pages/fsl/fsl_mrs/)) and package build (currently broken).
10. Update local master.
```git fetch upstream --tags```
```git checkout master```
```git merge upstream/master```
```git push origin --tags```
9. Trigger manual package build using the [fsl/conda/fsl-mrs:pre-conda](https://git.fmrib.ox.ac.uk/fsl/conda/fsl-mrs:pre-conda) branch. Do this by updating the version number [here](https://git.fmrib.ox.ac.uk/fsl/conda/fsl-mrs/-/blob/mnt/pre-conda/meta.yaml#L6). This will trigger a pipeline from which the conda package can be downloaded (*Download build-noarch-conda-package:archive artifact*).
10. Send to MW for manual upload to the FSL conda channel.
\ No newline at end of file
11. Trigger manual package build using the [fsl/conda/fsl-mrs:pre-conda](https://git.fmrib.ox.ac.uk/fsl/conda/fsl-mrs:pre-conda) branch. Do this by updating the version number [here](https://git.fmrib.ox.ac.uk/fsl/conda/fsl-mrs/-/blob/mnt/pre-conda/meta.yaml#L6). This will trigger a pipeline from which the conda package can be downloaded (*Download build-noarch-conda-package:archive artifact*).
12. Send to MW for manual upload to the FSL conda channel.
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment