Skip to content

Commit

Permalink
Small change for macOS 11 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
bbfrederick committed Dec 1, 2020
1 parent cae37cf commit b4c2382
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1
1.0.2
2 changes: 1 addition & 1 deletion dockerbuild/build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions newrelease_todo
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions picachooser/scripts/PICAchooser
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
2 changes: 1 addition & 1 deletion picachooser/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b4c2382

Please sign in to comment.