Skip to content
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

Improve osgeo hook #693

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Improve osgeo hook #693

merged 3 commits into from
Jan 24, 2024

Conversation

eggertm
Copy link
Contributor

@eggertm eggertm commented Jan 22, 2024

Had issues trying to use GDAL (using the unofficial windows binaries), when loading a chart with EPSG coordinates. This required the data/proj folder to be bundled as well.

@eggertm
Copy link
Contributor Author

eggertm commented Jan 22, 2024

The CI test appears to fail on running cython, which I don't think is related to any of my rather miniscule changes.

@rokm
Copy link
Member

rokm commented Jan 23, 2024

By "unofficial windows binaries", you mean the builds at https://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal ?

@eggertm
Copy link
Contributor Author

eggertm commented Jan 23, 2024

Yes, correct.

@bwoodsend bwoodsend merged commit 416568b into pyinstaller:master Jan 24, 2024
2 checks passed
github-actions bot pushed a commit to wxx9248/Pickle-Rush that referenced this pull request Feb 12, 2024
…4.1 (#86)

Bumps
[pyinstaller-hooks-contrib](https://github.com/pyinstaller/pyinstaller-hooks-contrib)
from 2024.0 to 2024.1.
<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>2024.1</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>2024.1 (2024-02-10)</h2>
<p>Updated hooks</p>
<pre><code>
* Fix hook for ``osgeo``, to include proj data files.
(`[#693](pyinstaller/pyinstaller-hooks-contrib#693)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/693&gt;`_)
* Update the hook for ``sklearn.neighbors`` to account for removed
hidden
import ``neighbors._typedef``
(`[#698](pyinstaller/pyinstaller-hooks-contrib#698)

&lt;https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/698&gt;`_)
</code></pre>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/6e471c89068cc2be2d822d51fa68f411ae83e417"><code>6e471c8</code></a>
Release v2024.1</li>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/e77c5b7e6f2f671d562787a6927d8ed66b4dde26"><code>e77c5b7</code></a>
Scheduled weekly dependency update for week 05 (<a
href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/699">#699</a>)</li>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/2b5d8ea870af262b1d342e50a4a8c54fb7f63715"><code>2b5d8ea</code></a>
Update sklearn.neighbors hook to account for removed hidden import (<a
href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/698">#698</a>)</li>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/e8db76bbbacb2bf0b7537b3a72910db34d0afae3"><code>e8db76b</code></a>
Scheduled weekly dependency update for week 04 (<a
href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/696">#696</a>)</li>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/69a7deb2e344c0bfff7b6a498e0919f3f5db4479"><code>69a7deb</code></a>
Scheduled weekly dependency update for week 03 (<a
href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/694">#694</a>)</li>
<li><a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/416568b37e0b22d0ea50909e60d61e16fad76fbd"><code>416568b</code></a>
Improve osgeo hook (<a
href="https://redirect.github.com/pyinstaller/pyinstaller-hooks-contrib/issues/693">#693</a>)</li>
<li>See full diff in <a
href="https://github.com/pyinstaller/pyinstaller-hooks-contrib/compare/2024.0...2024.1">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=2024.0&new-version=2024.1)](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] <[email protected]>
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants