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.

Sign up for GitHub

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

Jump to bottom

🐛 FIX: Fix Path use for Sphinx 7.2 #70

Merged
merged 6 commits into from
Aug 18, 2023
Merged

🐛 FIX: Fix Path use for Sphinx 7.2 #70

merged 6 commits into from
Aug 18, 2023

Conversation

larsoner
Copy link
Contributor

Closes #69

@larsoner larsoner mentioned this pull request Aug 17, 2023
Closed
@larsoner larsoner mentioned this pull request Aug 17, 2023
Merged
@larsoner
Copy link
Contributor Author

@jdillard FYI looks like you need to approve the GH Actions to run on this PR

jdillard
jdillard reviewed Aug 18, 2023
View reviewed changes
.github/workflows/continuous-integration.yml
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
pip install -r requirements_dev.txt
pip install -r requirements_dev.txt $SPHINX_INSTALL
Copy link
Owner

Choose a reason for hiding this comment

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

Ah cool, I didn't know about this syntax option!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI it's a BASH variable set above rather than any pip-specific option. And if it's unset (which it can be) it's just an empty string

Copy link
Owner

Choose a reason for hiding this comment

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

That was bad wording on my part, I was referring to being able to use the pip command line argument to "override" the sphinx that is in requirements_dev.txt. On pip 20.0.2 I get ERROR: Double requirement given: sphinx (from -r requirements_dev.txt (line 5)) (already in sphinx==6.*, name='sphinx'), but it works on newer versions of pip so seems like a newer feature/change.

@jdillard jdillard merged commit fe8e3e4 into jdillard:master Aug 18, 2023
13 checks passed
@jdillard jdillard changed the title FIX: Fix Path use for Sphinx 7.2 🐛 FIX: Fix Path use for Sphinx 7.2 Aug 18, 2023
@larsoner larsoner deleted the path branch August 18, 2023 11:42
kai687 pushed a commit to kai687/sphinxawesome-theme that referenced this pull request Aug 21, 2023
@dependabot
chore(deps-dev): Bump sphinx-sitemap from 2.5.0 to 2.5.1 (#1469)
d2deade 
[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️ 

Rebasing might not happen immediately, so don't worry if this takes some
time.

Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.

---

[//]: # (dependabot-end)

Bumps [sphinx-sitemap](https://github.com/jdillard/sphinx-sitemap) from
2.5.0 to 2.5.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/jdillard/sphinx-sitemap/releases">sphinx-sitemap's
releases</a>.</em></p>
<blockquote>
<h2>Release 2.5.1 (2023-08-17)</h2>
<p>Install from <a
href="https://pypi.org/project/sphinx-sitemap/2.5.1/">PyPi</a></p>
<h2>What's Changed</h2>
<ul>
<li>:bug: FIX: Fix incremental building by preventing multiprocessing
queue from being pickled with environment by <a
href="https://github.com/bstrdsmkr"><code>@​bstrdsmkr</code></a> in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/62">jdillard/sphinx-sitemap#62</a></li>
<li>:wrench: MAINT: Add docstrings and type hints by <a
href="https://github.com/jdillard"><code>@​jdillard</code></a> in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/61">jdillard/sphinx-sitemap#61</a></li>
<li>[pre-commit.ci] pre-commit autoupdate by <a
href="https://github.com/pre-commit-ci"><code>@​pre-commit-ci</code></a>
in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/63">jdillard/sphinx-sitemap#63</a></li>
<li>[pre-commit.ci] pre-commit autoupdate by <a
href="https://github.com/pre-commit-ci"><code>@​pre-commit-ci</code></a>
in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/65">jdillard/sphinx-sitemap#65</a></li>
<li>[pre-commit.ci] pre-commit autoupdate by <a
href="https://github.com/pre-commit-ci"><code>@​pre-commit-ci</code></a>
in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/68">jdillard/sphinx-sitemap#68</a></li>
<li>:bug: FIX: Fix Path use for Sphinx 7.2 by <a
href="https://github.com/larsoner"><code>@​larsoner</code></a> in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/70">jdillard/sphinx-sitemap#70</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/bstrdsmkr"><code>@​bstrdsmkr</code></a>
made their first contribution in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/62">jdillard/sphinx-sitemap#62</a></li>
<li><a
href="https://github.com/pre-commit-ci"><code>@​pre-commit-ci</code></a>
made their first contribution in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/63">jdillard/sphinx-sitemap#63</a></li>
<li><a href="https://github.com/larsoner"><code>@​larsoner</code></a>
made their first contribution in <a
href="https://redirect.github.com/jdillard/sphinx-sitemap/pull/70">jdillard/sphinx-sitemap#70</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/jdillard/sphinx-sitemap/compare/v2.5.0...v2.5.1">https://github.com/jdillard/sphinx-sitemap/compare/v2.5.0...v2.5.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/jdillard/sphinx-sitemap/blob/master/CHANGELOG.rst">sphinx-sitemap's
changelog</a>.</em></p>
<blockquote>
<h2>2.5.1</h2>
<p><em>Release date: 2023-08-17</em></p>
<ul>
<li>|:bug:| FIX: Fix Path use for Sphinx 7.2
<code>[#70](jdillard/sphinx-sitemap#70)
&lt;https://github.com/jdillard/sphinx-sitemap/pull/70&gt;</code>_</li>
<li>|:bug:| FIX: Fix incremental building by preventing multiprocessing
queue from being pickled with environment
<code>[#62](jdillard/sphinx-sitemap#62)
&lt;https://github.com/jdillard/sphinx-sitemap/pull/62&gt;</code>_</li>
<li>|:wrench:| MAINT: Add docstrings and type hints
<code>[#61](jdillard/sphinx-sitemap#61)
&lt;https://github.com/jdillard/sphinx-sitemap/pull/61&gt;</code>_</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/f1a5339a7f76c9c51e05218ca07b8267bb008d68"><code>f1a5339</code></a>
Prep for v2.5.1</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/eff9209f1458fb9c4afed87f101c9bed96aed73e"><code>eff9209</code></a>
Fix typo</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/fe8e3e43b9723a6d28ae2a81521df8b6a2d36c4a"><code>fe8e3e4</code></a>
FIX: Fix Path use for Sphinx 7.2 (<a
href="https://redirect.github.com/jdillard/sphinx-sitemap/issues/70">#70</a>)</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/af2f37985b435210b7aa03e216b2ee1b0ba249fc"><code>af2f379</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://redirect.github.com/jdillard/sphinx-sitemap/issues/68">#68</a>)</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/3bd87ef166bc9f3758d360ad4d23b524668b161d"><code>3bd87ef</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://redirect.github.com/jdillard/sphinx-sitemap/issues/65">#65</a>)</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/912e9d312402f123fb9db3840ee060ec54505f61"><code>912e9d3</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://redirect.github.com/jdillard/sphinx-sitemap/issues/63">#63</a>)</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/19d8fe38bd0cdefb62a52041c813f7f0d2cf39a1"><code>19d8fe3</code></a>
MAINT: Add docstrings and type hints (<a
href="https://redirect.github.com/jdillard/sphinx-sitemap/issues/61">#61</a>)</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/65516cf0fa6b599590aefe746bd344aeae44c26f"><code>65516cf</code></a>
FIX: Fix incremental building by preventing multiprocessing queue from
being ...</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/c28221dcee8af8a1dfed149ab91e2af53121e6b1"><code>c28221d</code></a>
Add language server</li>
<li><a
href="https://github.com/jdillard/sphinx-sitemap/commit/8a96595864b3e02ae0debc86c8fa883686391bbd"><code>8a96595</code></a>
Fix typo</li>
<li>Additional commits viewable in <a
href="https://github.com/jdillard/sphinx-sitemap/compare/v2.5.0...v2.5.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sphinx-sitemap&package-manager=pip&previous-version=2.5.0&new-version=2.5.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] <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
Reviewers

@jdillard jdillard jdillard left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Error with Sphinx 7.2
2 participants
@larsoner @jdillard