Skip to content

build: add pyinstaller hook for googleapiclient #5619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2021
Merged

build: add pyinstaller hook for googleapiclient #5619

merged 3 commits into from
Mar 14, 2021

Conversation

0x2b3bfa0
Copy link
Member

@0x2b3bfa0 0x2b3bfa0 commented Mar 14, 2021

The Google API Discovery Service JSON files from googleapiclient/discovery_cache/documents were being excluded due to a bug and, particularly, drive.v2.json is essential for our gdrive backend. Now we're explicitly asking PyInstaller to embed these files on the generated packages. (Fixes #5618)

The Google API Discovery Service JSON files from
googleapiclient/discovery_cache/documents were being
excluded due to a bug and, particularly, drive.v2.json
is essential for our gdrive backend. Now we're explicitly
asking PyInstaller to embed these files on the generated packages.

Fixes #5618
@0x2b3bfa0
Copy link
Member Author

0x2b3bfa0 commented Mar 14, 2021

scripts/hooks/hook-googleapiclient.model.py:2:0: E0401: Unable to import 'PyInstaller.utils.hooks' (import-error)

It looks like Vigil could be a more appropriate language for this linter.

Co-authored-by: Peter Rowlands (변기호) <peter@pmrowla.com>
@pmrowla
Copy link
Contributor

pmrowla commented Mar 14, 2021

@0x2b3bfa0 There's a new linter issue - imports should be on separate lines (my mistake). You should set up our pre-commit hooks so this shows up in your environment though (along with things like the original pylint issue) https://dvc.org/doc/user-guide/contributing/core#development-environment

@0x2b3bfa0
Copy link
Member Author

🙏 Thank you again, @pmrowla! This time, failed checks don't have anything to do with my pre-commit laziness. 🙃

dvc/tests/func/test_scm.py

Lines 246 to 248 in 6ac7def

# libgit2 stash_save() is flaky on linux when run inside pytest, see:
# https://github.com/iterative/dvc/pull/5286#issuecomment-792574294
@flaky(max_runs=5, min_passes=1)

@0x2b3bfa0 0x2b3bfa0 requested a review from pmrowla March 14, 2021 10:36
Copy link
Contributor

@efiop efiop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! 🙏

@efiop efiop merged commit 4ed55d0 into iterative:master Mar 14, 2021
@0x2b3bfa0 0x2b3bfa0 deleted the googleapi-pyinstaller-hook branch March 14, 2021 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gdrive: raises unexpected error - name: drive version: v2
3 participants