diff --git a/CHANGELOG.md b/CHANGELOG.md index 374785e..917d7a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # History of changes +## Version 1.0.2 (11/24/20) +* Added line to help QT compatibility with macOS 11 (Big Sur). + ## Version 1.0.1 (6/30/20) * Just bumping the version number to generate an initial Zenodo DOI. diff --git a/Dockerfile b/Dockerfile index 6df03a3..826a638 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,4 +124,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/bbfrederick/picachooser" \ org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0.1" + org.label-schema.schema-version="1.0.2" diff --git a/VERSION b/VERSION index 7dea76e..6d7de6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/dockerbuild/build.sh b/dockerbuild/build.sh index 8f6e4db..890bc36 100755 --- a/dockerbuild/build.sh +++ b/dockerbuild/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION='1.0.1' +VERSION='1.0.2' docker build . -t fredericklab/picachooser:${VERSION} docker build . -t fredericklab/picachooser:latest diff --git a/newrelease_todo b/newrelease_todo index 41635e9..c701488 100644 --- a/newrelease_todo +++ b/newrelease_todo @@ -36,8 +36,8 @@ + Create and push a new tag (instructions from https://git-scm.com/book/en/v2/Git-Basics-Tagging): - git tag -a v1.0.1 -m "v1.0.1" - git push origin v1.0.1 + git tag -a v1.0.2 -m "v1.0.2" + git push origin v1.0.2 + Edit the release notes on github diff --git a/picachooser/scripts/PICAchooser b/picachooser/scripts/PICAchooser index 24ee4ba..f685b0c 100644 --- a/picachooser/scripts/PICAchooser +++ b/picachooser/scripts/PICAchooser @@ -44,6 +44,9 @@ import picachooser.colormaps as cm hammingwindows = {} +# fix for Big Sur on macOS +os.environ['QT_MAC_WANTS_LAYER'] = '1' + def is_valid_dir(parser, arg): """ diff --git a/picachooser/version.py b/picachooser/version.py index c1264d4..64a66bc 100644 --- a/picachooser/version.py +++ b/picachooser/version.py @@ -4,7 +4,7 @@ # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z" _version_major = 1 _version_minor = 0 -_version_micro = 1 # use '' for first of series, number for 1 and above +_version_micro = 2 # use '' for first of series, number for 1 and above _version_extra = '' # _version_extra = '' # Uncomment this for full releases diff --git a/setup.py b/setup.py index aaeda78..4298b54 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ def update_gittag_py(): # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='1.0.1', + version='1.0.2', description='Lightweight GUI for sorting MELODIC ICA components.', long_description=long_description,