Skip to content

Commit

Permalink
Prepare a 4.3.2 release
Browse files Browse the repository at this point in the history
Revert commit df7032f (see Github issue #229 for explanation)
  • Loading branch information
marcelzwiers committed Mar 29, 2024
1 parent 2339f1b commit 290321c
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -31,7 +31,7 @@ RUN mkdir -p /opt/miniconda3; \
# Clone bidscoin and switch to the qt5 branch \
git clone https://github.com/Donders-Institute/bidscoin.git /opt/bidscoin; \
cd /opt/bidscoin; \
git checkout v4.3.1+qt5; \
git checkout v4.3.2+qt5; \
rm -rf docs tests .git


Expand Down
4 changes: 2 additions & 2 deletions apptainer.def
Expand Up @@ -36,7 +36,7 @@ Stage: builder
# Clone bidscoin and switch to the qt5 branch
git clone https://github.com/Donders-Institute/bidscoin.git /opt/bidscoin
cd /opt/bidscoin
git checkout v4.3.1+qt5
git checkout v4.3.2+qt5
rm -rf docs tests .git


Expand All @@ -48,7 +48,7 @@ Stage: final
This BIDScoin Apptainer image includes:

* Debian stable,
* The latest stable release of BIDScoin (v4.3.1+qt5)
* The latest stable release of BIDScoin (v4.3.2+qt5)
* The latest versions of dcm2niix, pydeface, spec2nii and some FSL tools

The general form to run BIDScoin commands is:
Expand Down
2 changes: 1 addition & 1 deletion bidscoin/heuristics/bidsmap_bids2bids.yaml
Expand Up @@ -22,7 +22,7 @@ Options:
# General BIDScoin and plugin options
# --------------------------------------------------------------------------------
bidscoin:
version: 4.3.1+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
version: 4.3.2+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
subprefix: sub- # The subject prefix of the source data
sesprefix: ses- # The session prefix of the source data
bidsignore: [mrs/, extra_data/, sub-*_ct.*] # List of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. [extra_data/, pet/, myfile.txt, yourfile.csv]
Expand Down
2 changes: 1 addition & 1 deletion bidscoin/heuristics/bidsmap_dccn.yaml
Expand Up @@ -23,7 +23,7 @@ Options:
# General BIDScoin and plugin options
# --------------------------------------------------------------------------------
bidscoin:
version: 4.3.1+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
version: 4.3.2+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
subprefix: sub- # The subject prefix of the source data
sesprefix: ses- # The session prefix of the source data
bidsignore: [mrs/, extra_data/, sub-*_ct.*] # List of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. [extra_data/, pet/, myfile.txt, yourfile.csv]
Expand Down
2 changes: 1 addition & 1 deletion bidscoin/heuristics/bidsmap_sst.yaml
Expand Up @@ -22,7 +22,7 @@ Options:
# General BIDScoin and plugin options
# --------------------------------------------------------------------------------
bidscoin:
version: 4.3.1+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
version: 4.3.2+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
subprefix: sub- # The subject prefix of the source data
sesprefix: ses- # The session prefix of the source data
bidsignore: [mrs/, extra_data/, sub-*_ct.*] # List of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. [extra_data/, pet/, myfile.txt, yourfile.csv]
Expand Down
8 changes: 7 additions & 1 deletion docs/CHANGELOG.md
Expand Up @@ -4,6 +4,11 @@

## [dev]

## [4.3.2] - 2024-03-29

### Fixed
- A regression was introduced when fixing Github issue #229 (now reverted)

## [4.3.1] - 2024-03-27

### Added
Expand Down Expand Up @@ -438,7 +443,8 @@ A first stable release of BIDScoin :-)
### To do
- Add support for non-imaging data

[dev]: https://github.com/Donders-Institute/bidscoin/compare/4.3.1...HEAD
[dev]: https://github.com/Donders-Institute/bidscoin/compare/4.3.2...HEAD
[4.3.2]: https://github.com/Donders-Institute/bidscoin/compare/4.3.1...4.3.2
[4.3.1]: https://github.com/Donders-Institute/bidscoin/compare/4.3.0...4.3.1
[4.3.0]: https://github.com/Donders-Institute/bidscoin/compare/4.2.1...4.3.0
[4.2.1]: https://github.com/Donders-Institute/bidscoin/compare/4.2.0...4.2.1
Expand Down
8 changes: 4 additions & 4 deletions docs/installation.rst
Expand Up @@ -35,11 +35,11 @@ If you do not have git (or any other version control system) installed you can `
$ pip install ./bidscoin[dcm2niix2bids]
If you are installing BIDScoin on an older system and you are getting Qt6 errors, you can try to install a ``+qt5`` build, e.g. for version 4.3.1:
If you are installing BIDScoin on an older system and you are getting Qt6 errors, you can try to install a ``+qt5`` build, e.g. for version 4.3.2:

.. code-block:: console
$ pip install bidscoin[dcm2niix2bids]@git+https://github.com/Donders-Institute/bidscoin@v4.3.1+qt5
$ pip install bidscoin[dcm2niix2bids]@git+https://github.com/Donders-Institute/bidscoin@v4.3.2+qt5
Updating BIDScoin
^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -92,7 +92,7 @@ An alternative for installing Python, BIDScoin and it's dependencies yourself is
The current Apptainer image includes:

* Debian stable,
* The latest stable release (v4.3.1+qt5) of BIDScoin
* The latest stable release (v4.3.2+qt5) of BIDScoin
* The latest versions of dcm2niix, pydeface, spec2nii

This image does not include FreeSurfer/synthstrip (needed for ``skullstrip``)
Expand Down Expand Up @@ -148,7 +148,7 @@ If the Apptainer container is not working for you, it is also possible to use a
The current Docker image includes the same as the Apptainer image:

* Debian stable,
* The latest stable release of BIDScoin (v4.3.1+qt5)
* The latest stable release of BIDScoin (v4.3.2+qt5)
* The latest versions of dcm2niix, pydeface, spec2nii and some FSL tools

Likewise, the current image does not include FreeSurfer/synthstrip (needed for ``skullstrip``)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
[project]
name = 'bidscoin'
description = 'Converts and organises raw MRI data-sets according to the Brain Imaging Data Structure (BIDS)'
version = '4.3.1+qt5'
version = '4.3.2+qt5'
readme = 'README.rst'
requires-python = '>= 3.8'
license = {file = 'LICENSE.txt'}
Expand Down
3 changes: 2 additions & 1 deletion release_procedure.rst
Expand Up @@ -12,7 +12,7 @@ This document describes how to prepare a new BIDScoin release from within the DC
6. Manually run the bidscoin, bidsmapper, bidscoiner, bids-validator and other integration tests
7. Run tox@DCCN::

VERSION="4.3.1"
VERSION="4.3.2"
cd ~/python/bidscoin
git checkout v${VERSION}+qt5
module load bidscoin/dev
Expand Down Expand Up @@ -62,6 +62,7 @@ Dockerhub

1. In the VM, build, test and push a Docker image::

VERSION="4.3.2"
sudo docker build -t marcelzwiers/bidscoin:$VERSION .
sudo docker run --rm marcelzwiers/bidscoin:$VERSION bidscoin -v
sudo docker run --rm marcelzwiers/bidscoin:$VERSION pngappend
Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/bidsmap.yaml
Expand Up @@ -22,7 +22,7 @@ Options:
# General options and plugins
# --------------------------------------------------------------------------------
bidscoin:
version: 4.3.1+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
version: 4.3.2+qt5 # BIDScoin version (should correspond with the version in pyproject.toml)
bidsignore: mrs/;extra_data/ # Semicolon-separated list of entries that are added to the .bidsignore file (for more info, see BIDS specifications), e.g. extra_data/;pet/;myfile.txt;yourfile.csv
subprefix: sub- # The subject prefix of the source data
sesprefix: ses- # The session prefix of the source data
Expand Down

0 comments on commit 290321c

Please sign in to comment.