From 17b48eb0cdc5c2e23aa35c96807c29b3378e79e5 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Thu, 14 Feb 2019 14:40:43 +0100 Subject: [PATCH 1/5] Updated dependencies for Windows and macOS builds Updated to latest PyQt 5.12 and mutagen 1.42 --- requirements-macos.txt | 4 ++-- requirements-win.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-macos.txt b/requirements-macos.txt index 04e7814bc..28acd18c5 100644 --- a/requirements-macos.txt +++ b/requirements-macos.txt @@ -1,3 +1,3 @@ discid==1.1.1 -mutagen==1.41.1 -PyQt5==5.10.1 +mutagen==1.42.0 +PyQt5==5.12 diff --git a/requirements-win.txt b/requirements-win.txt index ca982d262..28acd18c5 100644 --- a/requirements-win.txt +++ b/requirements-win.txt @@ -1,3 +1,3 @@ discid==1.1.1 -mutagen==1.41.1 -PyQt5==5.11.3 +mutagen==1.42.0 +PyQt5==5.12 From f54753fccb144e5aaa56c24841d073728e705a5f Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 15 Feb 2019 14:03:51 +0100 Subject: [PATCH 2/5] CI: Use older PyQt 5.10 for macOS xcode6.4 builds --- .travis.yml | 4 ++-- requirements-macos-xcode64.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 requirements-macos-xcode64.txt diff --git a/.travis.yml b/.travis.yml index 2c4df4f95..8076af2b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ matrix: - DISCID_VERSION=0.6.2 - FPCALC_VERSION=1.4.3 - PYTHON_VERSION=3.7.2 - - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos.txt" + - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos-xcode64.txt" - os: osx osx_image: xcode7.3 language: generic @@ -39,7 +39,7 @@ matrix: - DISCID_VERSION=0.6.2 - FPCALC_VERSION=1.4.3 - PYTHON_VERSION=3.7.2 - - INSTALL_DEPS="$PIP_INSTALL pyqt5==5.11.3 mutagen discid" + - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos.txt" fast_finish: true before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq && sudo apt-get diff --git a/requirements-macos-xcode64.txt b/requirements-macos-xcode64.txt new file mode 100644 index 000000000..0b9964961 --- /dev/null +++ b/requirements-macos-xcode64.txt @@ -0,0 +1,3 @@ +discid==1.1.1 +mutagen==1.42.0 +PyQt5==5.10.1 From 19d26eed87b5e5e41bd32275e192b9107b9302e2 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 15 Feb 2019 14:08:49 +0100 Subject: [PATCH 3/5] CI: Include a build using always latest depdency versions --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8076af2b3..b68919311 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - CODACY="$PIP_INSTALL codacy-coverage" - LIBDISCID="libdiscid0 libdiscid-dev" matrix: + - INSTALL_DEPS="$PIP_INSTALL -r requirements.txt" - INSTALL_DEPS="$PIP_INSTALL pyqt5==5.11.3 mutagen discid" - INSTALL_DEPS="$PIP_INSTALL pyqt5==5.10 mutagen discid" - INSTALL_DEPS="$PIP_INSTALL pyqt5==5.9 mutagen discid" From 352da1d4c48048f43926c43882494c39bc3cf701 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 15 Feb 2019 14:34:06 +0100 Subject: [PATCH 4/5] CI: Revert to PyQt 5.10.1 for all macOS builds --- .travis.yml | 2 +- requirements-macos-xcode64.txt | 3 --- requirements-macos.txt | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 requirements-macos-xcode64.txt diff --git a/.travis.yml b/.travis.yml index b68919311..58180071b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - DISCID_VERSION=0.6.2 - FPCALC_VERSION=1.4.3 - PYTHON_VERSION=3.7.2 - - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos-xcode64.txt" + - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos.txt" - os: osx osx_image: xcode7.3 language: generic diff --git a/requirements-macos-xcode64.txt b/requirements-macos-xcode64.txt deleted file mode 100644 index 0b9964961..000000000 --- a/requirements-macos-xcode64.txt +++ /dev/null @@ -1,3 +0,0 @@ -discid==1.1.1 -mutagen==1.42.0 -PyQt5==5.10.1 diff --git a/requirements-macos.txt b/requirements-macos.txt index 28acd18c5..0b9964961 100644 --- a/requirements-macos.txt +++ b/requirements-macos.txt @@ -1,3 +1,3 @@ discid==1.1.1 mutagen==1.42.0 -PyQt5==5.12 +PyQt5==5.10.1 From 473169c4c73e42b5f25b399fad5da6c652c045d8 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 15 Feb 2019 14:36:34 +0100 Subject: [PATCH 5/5] CI: Include build against latest macOS image xcode10.1 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 58180071b..4aaf109f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,13 @@ matrix: - FPCALC_VERSION=1.4.3 - PYTHON_VERSION=3.7.2 - INSTALL_DEPS="$PIP_INSTALL -r requirements-macos.txt" + - os: osx + osx_image: xcode10.1 + language: generic + env: + - DISCID_VERSION=0.6.2 + - FPCALC_VERSION=1.4.3 + - PYTHON_VERSION=3.7.2 fast_finish: true before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq && sudo apt-get