From f2ba67aece1d5ff3bc5aaf2d40948606c3f7e5c8 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 24 Mar 2021 09:43:05 +0200 Subject: [PATCH] build: upgrade pyinstaller to 4.2 (#5682) * build: upgrade pyinstaller to 4.2 * pyinstaller: hooks: remove hook-googleapiclient.model.py https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-googleapiclient.model.py * gha: use python 3.8 for pyinstaller --- .github/workflows/packages.yaml | 16 ++++++++-------- scripts/build-requirements.txt | 2 +- .../hooks/hook-googleapiclient.model.py | 8 -------- 3 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 scripts/pyinstaller/hooks/hook-googleapiclient.model.py diff --git a/.github/workflows/packages.yaml b/.github/workflows/packages.yaml index deaf92564..4124bd69d 100644 --- a/.github/workflows/packages.yaml +++ b/.github/workflows/packages.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v2.3.2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2.1.4 with: - python-version: 3.7 + python-version: 3.8 - name: Set up Ruby 2.4 uses: actions/setup-ruby@v1 with: @@ -44,10 +44,10 @@ jobs: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v2.3.2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2.1.4 with: - python-version: 3.7 + python-version: 3.8 - name: Set up Ruby 2.4 uses: actions/setup-ruby@v1 with: @@ -78,10 +78,10 @@ jobs: runs-on: macos-10.15 steps: - uses: actions/checkout@v2.3.2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2.1.4 with: - python-version: 3.7 + python-version: 3.8 - name: Set up Ruby 2.4 uses: actions/setup-ruby@v1 with: @@ -112,10 +112,10 @@ jobs: runs-on: windows-2019 steps: - uses: actions/checkout@v2.3.2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2.1.4 with: - python-version: 3.7 + python-version: 3.8 - name: Install deps run: | pip install .[all] diff --git a/scripts/build-requirements.txt b/scripts/build-requirements.txt index 0c2fb74f8..df42397f0 100644 --- a/scripts/build-requirements.txt +++ b/scripts/build-requirements.txt @@ -1,2 +1,2 @@ -PyInstaller==3.5 +PyInstaller==4.2 numpy==1.19.3 diff --git a/scripts/pyinstaller/hooks/hook-googleapiclient.model.py b/scripts/pyinstaller/hooks/hook-googleapiclient.model.py deleted file mode 100644 index e73889752..000000000 --- a/scripts/pyinstaller/hooks/hook-googleapiclient.model.py +++ /dev/null @@ -1,8 +0,0 @@ -"""Temporary fix for https://github.com/iterative/dvc/issues/5618.""" -from PyInstaller.utils.hooks import ( # pylint:disable=import-error - collect_data_files, - copy_metadata, -) - -datas = collect_data_files("googleapiclient.discovery") -datas += copy_metadata("google_api_python_client")