From cd59d1ad08b9b7f116dc11897d1b8a55b1e0c6f2 Mon Sep 17 00:00:00 2001 From: Michael Wiencek Date: Thu, 26 Jul 2018 20:57:28 -0500 Subject: [PATCH 1/3] Install python 3.6 for macOS from official pkg --- scripts/setup-osx.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/setup-osx.sh b/scripts/setup-osx.sh index b06e6695d..578384558 100755 --- a/scripts/setup-osx.sh +++ b/scripts/setup-osx.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash brew update -brew tap samj1912/core -brew tap-pin samj1912/core -brew install python3 -brew link python3 --force brew install gettext brew link gettext --force +wget "https://www.python.org/ftp/python/3.6.6/python-3.6.6-macosx10.9.pkg" +sudo installer -pkg python-3.6.6-macosx10.9.pkg -target / +sudo python3 -m ensurepip wget "ftp://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-$DISCID_VERSION.tar.gz" tar -xf "libdiscid-$DISCID_VERSION.tar.gz" cd "libdiscid-$DISCID_VERSION" @@ -18,4 +17,4 @@ tar -xf "chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64.tar.gz" cp "chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64/fpcalc" . pip3 install --upgrade pip setuptools wheel pip3 install virtualenv -virtualenv -p python3 . +python3 -m virtualenv -p python3 . From c86d5915da2e3908588d903e202d089eccd09bd0 Mon Sep 17 00:00:00 2001 From: Michael Wiencek Date: Fri, 27 Jul 2018 16:43:25 -0500 Subject: [PATCH 2/3] Add dist to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ea2f6a73c..3d58ffe97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ build build.cfg +dist .pydevproject .project .idea From 6b7653bcc3c0f05b16ba7474d36cf8ac22f0f015 Mon Sep 17 00:00:00 2001 From: Michael Wiencek Date: Thu, 26 Jul 2018 19:17:16 -0500 Subject: [PATCH 3/3] Codesign macOS releases --- .gitignore | 1 + scripts/appledev.p12.enc | Bin 0 -> 6432 bytes scripts/package-osx.sh | 30 ++++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 scripts/appledev.p12.enc diff --git a/.gitignore b/.gitignore index 3d58ffe97..22b7f3f35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +appledev.p12 build build.cfg dist diff --git a/scripts/appledev.p12.enc b/scripts/appledev.p12.enc new file mode 100644 index 0000000000000000000000000000000000000000..7a819fd49b67fa315f3dd4323cdc7742e44bd678 GIT binary patch literal 6432 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 u|DA=Xp@w