Add hooks for z3c.rml and freetype #674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a hook for `z3c.rml` that collects the required subset of TTF fonts bundled with `reportlab` package. The latter might be used without its bundled fonts, and some of them have restrictive license (e.g., DarkGarden), so instead of having a hook for `reportlab` that collects all fonts fron `reportlab.fonts`, we collect the required subset (Bitstream Vera fonts) in the `z3c.rml` hook.
Add hook for `freetype` that collects the shared library that is bundled with the `freetype-py` PyPI wheels.
bwoodsend
approved these changes
Dec 20, 2023
github-actions bot
pushed a commit
to wxx9248/CIS-Game-Project-2023W
that referenced
this pull request
Dec 20, 2023
…23.11 (#82) Bumps [pyinstaller-hooks-contrib](https://github.com/pyinstaller/pyinstaller-hooks-contrib) from 2023.10 to 2023.11. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/releases">pyinstaller-hooks-contrib's releases</a>.</em></p> <blockquote> <h2>2023.11</h2> <p>Please see the <a href="https://www.github.com/pyinstaller/pyinstaller-hooks-contrib/tree/master/CHANGELOG.rst">changelog</a> for more details</p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/CHANGELOG.rst">pyinstaller-hooks-contrib's changelog</a>.</em></p> <blockquote> <h2>2023.11 (2023-12-20)</h2> <p>New hooks</p> <pre><code> * Add a hook for ``freetype`` that collects the shared library that is bundled with ``freetype-py`` PyPI wheels. (`[#674](pyinstaller/pyinstaller-hooks-contrib#674) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/674>`_) * Add a hook for ``z3c.rml`` that collects the required subset of Bitstream Vera TTF fonts from the ``reportlab`` package. (`[#674](pyinstaller/pyinstaller-hooks-contrib#674) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/674>`_) * Add hook for ``eth_rlp``. (`[#672](pyinstaller/pyinstaller-hooks-contrib#672) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/672>`_) * Add hook for ``eth_typing`` which requires its package metadata. (`[#656](pyinstaller/pyinstaller-hooks-contrib#656) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/656>`_) * Add hook for ``eth_utils`` to collect its embedded JSON files. (`[#656](pyinstaller/pyinstaller-hooks-contrib#656) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/656>`_) * Add hook for ``rlp``. (`[#672](pyinstaller/pyinstaller-hooks-contrib#672) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/672>`_) * Add hook for ``sspilib`` that collects submodules of ``sspilib.raw``, most of which are cythonized extensions. (`[#669](pyinstaller/pyinstaller-hooks-contrib#669) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/669>`_) <p>Updated hooks </code></pre></p> <ul> <li>Modernize the hook for <code>torch</code> and reduce the amount of unnecessarily collected data files (header files and static libraries). Requires PyInstaller >= 6.0. (<code>[#666](pyinstaller/pyinstaller-hooks-contrib#666) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/666></code>_)</li> <li>Update <code>pyarrow</code> hook to collect all of the package's submodules. (<code>[#662](pyinstaller/pyinstaller-hooks-contrib#662) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/662></code>_)</li> <li>Update <code>rtree</code> hook for compatibility with <code>Rtree >= 1.1.0</code>. (<code>[#657](pyinstaller/pyinstaller-hooks-contrib#657) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/657></code>_)</li> <li>Update <code>sudachipy</code> hook for <code>sudachipy</code> 0.6.8. (<code>[#673](pyinstaller/pyinstaller-hooks-contrib#673) <https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/673></code>_)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/3bd34d400863c8b0466bf1e84a57b6814e13476e"><code>3bd34d4</code></a> Release v2023.11</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/11dff78740e2dc7b6685388c70c8e9ba0e07a03a"><code>11dff78</code></a> hooks: add hook for freetype</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/7916492b83f98674529594083e2a6ba1e294ccbd"><code>7916492</code></a> hooks: add hook for z3c.rml</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/937ca15b5f4d17ed0421e4a3fe2bcafd234954a9"><code>937ca15</code></a> Scheduled weekly dependency update for week 51 (<a href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/671">#671</a>)</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/6a303f6c0bd7c2c51adf0418ed0cef19d647bb76"><code>6a303f6</code></a> tests: fix deprecation warnings in test_sudachipy</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/6cb34e6a78b8a1368297cbef80bf96605cafe15b"><code>6cb34e6</code></a> hooks: sudachipy: add hiddenimports for v0.6.8</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/97800abfb16f3e4a54bcc38f752b924a9e93d9ba"><code>97800ab</code></a> tests: repin sudachipy to latest version</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/23cd820137a8905b018cc1c56d4e2d0a347bd9f4"><code>23cd820</code></a> ci: install sudachidict packages on sudachipy update</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/f8aaa39b4dac28b8da62f3b2f5633425ac5fd153"><code>f8aaa39</code></a> tests: fix dependencies of sudachipy test</li> <li><a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/f9c592dfcd7491cf6a6d33adde89fdf413d0914f"><code>f9c592d</code></a> hooks: add hook for eth_rlp</li> <li>Additional commits viewable in <a href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/compare/2023.10...2023.11">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add hook for
z3c.rmlthat collects the required subset of Bitstream Vera TTF fonts fromreportlabpackage (this is in contrast to the initial plan and the usual approach of collecting all fonts inreportlabhook - becausereportlabcan be used without its bundled fonts, and because DarkGarden font is GPL'd).Closes pyinstaller/pyinstaller#8135.
Add hook for
freetypethat collects the shared library that is bundled withfreetype-pyPyPI wheels. The upstream has a hook, but due to an oversight, it is currently defunct. The idea is to provide our copy while they decide on the fix (rougier/freetype-py#180) and until they push an update.