Skip to content
New issue

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

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

Already on GitHub? # to your account

tests: fix dependencies of sudachipy test #673

Merged
merged 5 commits into from
Dec 18, 2023

Conversation

rokm
Copy link
Member

@rokm rokm commented Dec 18, 2023

sudachipy test depends on availability of dictionary packages (sudachidict_small, sudachidict_core, and sudachidict_full), so skip the test if they are not available.

In practice, this means that we likely will not be running this test on the pyup-bot PRs, unless both sudachipy and dictionary packages get updated at the same time.

`sudachipy` test depends on availability of dictionary packages
(`sudachidict_small`, `sudachidict_core`, and `sudachidict_full`),
so skip the test if they are not available.

In practice, this means that we likely will not be running this
test on the pyup-bot PRs, unless both `sudachipy` and dictionary
packages get updated at the same time.
@bwoodsend
Copy link
Member

bwoodsend commented Dec 18, 2023

You don't fancy putting another one of these pieces of logic in to install all four packages if the PR change touches a line with sudachi in it?

if grep -q pyqtgraph requirements-test-libraries.txt ; then echo PyQt5 >> requirements-test-libraries.txt ;fi

In theory, everything should be at its latest version so you wouldn't have to worry about preserving the version constraints.

@rokm rokm force-pushed the fix-sudachipy-test-dependencies branch 2 times, most recently from c8af3b8 to 9f5e03c Compare December 18, 2023 22:46
@rokm rokm force-pushed the fix-sudachipy-test-dependencies branch from 9f5e03c to 2b2b8ce Compare December 18, 2023 22:51
@rokm
Copy link
Member Author

rokm commented Dec 18, 2023

Well, this was... interesting and fun. On the plus side, the snafu with SudachiDict_full-0.0.0-py3-none-any.whl did reveal that we need to add sudachipy.errors to hiddenimports for v0.6.8.

@rokm rokm merged commit 6a303f6 into pyinstaller:master Dec 18, 2023
14 checks passed
@rokm rokm deleted the fix-sudachipy-test-dependencies branch December 18, 2023 23:02
github-actions bot pushed a commit to wxx9248/Pickle-Rush 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://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)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/674&gt;`_)
* 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)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/674&gt;`_)
* Add hook for ``eth_rlp``.
(`[#672](pyinstaller/pyinstaller-hooks-contrib#672)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/672&gt;`_)
* Add hook for ``eth_typing`` which requires its package metadata.
(`[#656](pyinstaller/pyinstaller-hooks-contrib#656)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/656&gt;`_)
* Add hook for ``eth_utils`` to collect its embedded JSON files.
(`[#656](pyinstaller/pyinstaller-hooks-contrib#656)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/656&gt;`_)
* Add hook for ``rlp``.
(`[#672](pyinstaller/pyinstaller-hooks-contrib#672)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/672&gt;`_)
* Add hook for ``sspilib`` that collects submodules of ``sspilib.raw``,
most of which are cythonized extensions.
(`[#669](pyinstaller/pyinstaller-hooks-contrib#669)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/669&gt;`_)
<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 &gt;= 6.0.
(<code>[#666](pyinstaller/pyinstaller-hooks-contrib#666)
&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/666&gt;</code>_)</li>
<li>Update <code>pyarrow</code> hook to collect all of the package's
submodules.
(<code>[#662](pyinstaller/pyinstaller-hooks-contrib#662)
&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/662&gt;</code>_)</li>
<li>Update <code>rtree</code> hook for compatibility with <code>Rtree
&gt;= 1.1.0</code>.
(<code>[#657](pyinstaller/pyinstaller-hooks-contrib#657)
&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/657&gt;</code>_)</li>
<li>Update <code>sudachipy</code> hook for <code>sudachipy</code> 0.6.8.
(<code>[#673](pyinstaller/pyinstaller-hooks-contrib#673)
&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/673&gt;</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://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 />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pyinstaller-hooks-contrib&package-manager=pip&previous-version=2023.10&new-version=2023.11)](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>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants