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 class decorator for classmethod overrides #404

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Fix class decorator for classmethod overrides #404

merged 1 commit into from
Mar 1, 2024

Conversation

bp72
Copy link
Contributor

@bp72 bp72 commented Nov 19, 2023 •
edited
Loading

Is related to #402
The problem is reproduced when setUpClass calls another method: cls in this case is of base class type.

@bp72 bp72 force-pushed the issue-402 branch 2 times, most recently from 05cff9e to 9b1c15a Compare November 19, 2023 16:56
@bp72 bp72 mentioned this pull request Nov 19, 2023
Closed
adamchainz
adamchainz reviewed Mar 1, 2024
View reviewed changes
tests/test_time_machine.py Outdated
def setUpTestData(cls) -> None:
cls.prop = False

@pytest.mark.skip()
Copy link
Owner

Choose a reason for hiding this comment

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

At first I was like “this test case doesn’t fail”, but then I spotted the skip. FYI in future, if you’re adding a failing test case, don’t skip it! Either leave it failing or use xfail: https://docs.pytest.org/en/6.2.x/skipping.html#xfail-mark-test-functions-as-expected-to-fail

@adamchainz adamchainz changed the title Add a test case for Django's setUpTestData issue Fix class decorator for classmethod overrides Mar 1, 2024
@adamchainz
Copy link
Owner

Thanks for the reproducer. I just had a fresh look and realized the fix.

@adamchainz adamchainz merged commit 3fbd386 into adamchainz:main Mar 1, 2024
7 checks passed
@bp72
Copy link
Contributor Author

bp72 commented Mar 3, 2024

@adamchainz thank you very much for the fix!

inmantaci pushed a commit to inmanta/inmanta-core that referenced this pull request Mar 4, 2024
@dependabot @inmantaci
Bump time-machine from 2.13.0 to 2.14.0 (PR #7305)
384df2d 
Bumps [time-machine](https://github.com/adamchainz/time-machine) from 2.13.0 to 2.14.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/adamchainz/time-machine/blob/main/CHANGELOG.rst">time-machine's changelog</a>.</em></p>
<blockquote>
<h2>2.14.0 (2024-03-03)</h2>
<ul>
<li>
<p>Fix <code>utcfromtimestamp()</code> warning on Python 3.12+.</p>
<p>Thanks to Konstantin Baikov in <code>PR [#424](adamchainz/time-machine#424) &lt;https://github.com/adamchainz/time-machine/pull/424&gt;</code>__.</p>
</li>
<li>
<p>Fix class decorator for classmethod overrides.</p>
<p>Thanks to Pavel Bitiukov for the reproducer in <code>PR [#404](adamchainz/time-machine#404) &lt;https://github.com/adamchainz/time-machine/pull/404&gt;</code>__.</p>
</li>
<li>
<p>Avoid calling deprecated <code>uuid._load_system_functions()</code> on Python 3.9+.</p>
<p>Thanks to Nikita Sobolev for the ping in <code>CPython Issue [#113308](https://github.com/adamchainz/time-machine/issues/113308) &lt;https://github.com/python/cpython/issues/113308&gt;</code>__.</p>
</li>
<li>
<p>Support Python 3.13 alpha 4.</p>
<p>Thanks to Miro Hrončok in <code>PR [#409](adamchainz/time-machine#409) &lt;https://github.com/adamchainz/time-machine/pull/409&gt;</code>__.</p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/adamchainz/time-machine/commit/8d4c9c078f00f761a676012ad984e01622c7e9ed"><code>8d4c9c0</code></a> Version 2.14.0</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/d4881aaa5b658dc138b023762ff151faafbc48ac"><code>d4881aa</code></a> Add Python 3.13 to the CI infrastructure, fix for 3.13.0a2+ (<a href="https://redirect.github.com/adamchainz/time-machine/issues/409">#409</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/3fbd386e6c576ef8edd48b480e3c84a6ef6feb55"><code>3fbd386</code></a> Fix class decorator for classmethod overrides (<a href="https://redirect.github.com/adamchainz/time-machine/issues/404">#404</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/46c66afbea82f163e1281cef55295382ce0c3eda"><code>46c66af</code></a> Fix utcfromtimestamp() deprecation warning (<a href="https://redirect.github.com/adamchainz/time-machine/issues/424">#424</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/2eda5ad3013dabaa7b0afe0dcd1f85310073a77d"><code>2eda5ad</code></a> Avoid calling uuid._load_system_functions() on Python 3.9+. (<a href="https://redirect.github.com/adamchainz/time-machine/issues/425">#425</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/4bd96a2ff28e2cf01c201ee9e5f93b498090b606"><code>4bd96a2</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/423">#423</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/5f35ec33825005de7bcf2a1918b312d6d97d009d"><code>5f35ec3</code></a> Use isort to sort imports</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/21036d16415b9b1cd9feea50db4975af1b295631"><code>21036d1</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/422">#422</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/1f3cbfcb0171056b7c92cb01cd131555de1cfa38"><code>1f3cbfc</code></a> Upgrade requirements (<a href="https://redirect.github.com/adamchainz/time-machine/issues/421">#421</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/36901fe51db82d7855ce8c3557c42d22e0519c26"><code>36901fe</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/420">#420</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/adamchainz/time-machine/compare/2.13.0...2.14.0">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=time-machine&package-manager=pip&previous-version=2.13.0&new-version=2.14.0)](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>
inmantaci pushed a commit to inmanta/inmanta-core that referenced this pull request Mar 6, 2024
@dependabot @inmantaci
Bump time-machine from 2.13.0 to 2.14.0 (PR #7303)
b0287e5 
Bumps [time-machine](https://github.com/adamchainz/time-machine) from 2.13.0 to 2.14.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/adamchainz/time-machine/blob/main/CHANGELOG.rst">time-machine's changelog</a>.</em></p>
<blockquote>
<h2>2.14.0 (2024-03-03)</h2>
<ul>
<li>
<p>Fix <code>utcfromtimestamp()</code> warning on Python 3.12+.</p>
<p>Thanks to Konstantin Baikov in <code>PR [#424](adamchainz/time-machine#424) &lt;https://github.com/adamchainz/time-machine/pull/424&gt;</code>__.</p>
</li>
<li>
<p>Fix class decorator for classmethod overrides.</p>
<p>Thanks to Pavel Bitiukov for the reproducer in <code>PR [#404](adamchainz/time-machine#404) &lt;https://github.com/adamchainz/time-machine/pull/404&gt;</code>__.</p>
</li>
<li>
<p>Avoid calling deprecated <code>uuid._load_system_functions()</code> on Python 3.9+.</p>
<p>Thanks to Nikita Sobolev for the ping in <code>CPython Issue [#113308](https://github.com/adamchainz/time-machine/issues/113308) &lt;https://github.com/python/cpython/issues/113308&gt;</code>__.</p>
</li>
<li>
<p>Support Python 3.13 alpha 4.</p>
<p>Thanks to Miro Hrončok in <code>PR [#409](adamchainz/time-machine#409) &lt;https://github.com/adamchainz/time-machine/pull/409&gt;</code>__.</p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/adamchainz/time-machine/commit/8d4c9c078f00f761a676012ad984e01622c7e9ed"><code>8d4c9c0</code></a> Version 2.14.0</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/d4881aaa5b658dc138b023762ff151faafbc48ac"><code>d4881aa</code></a> Add Python 3.13 to the CI infrastructure, fix for 3.13.0a2+ (<a href="https://redirect.github.com/adamchainz/time-machine/issues/409">#409</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/3fbd386e6c576ef8edd48b480e3c84a6ef6feb55"><code>3fbd386</code></a> Fix class decorator for classmethod overrides (<a href="https://redirect.github.com/adamchainz/time-machine/issues/404">#404</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/46c66afbea82f163e1281cef55295382ce0c3eda"><code>46c66af</code></a> Fix utcfromtimestamp() deprecation warning (<a href="https://redirect.github.com/adamchainz/time-machine/issues/424">#424</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/2eda5ad3013dabaa7b0afe0dcd1f85310073a77d"><code>2eda5ad</code></a> Avoid calling uuid._load_system_functions() on Python 3.9+. (<a href="https://redirect.github.com/adamchainz/time-machine/issues/425">#425</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/4bd96a2ff28e2cf01c201ee9e5f93b498090b606"><code>4bd96a2</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/423">#423</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/5f35ec33825005de7bcf2a1918b312d6d97d009d"><code>5f35ec3</code></a> Use isort to sort imports</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/21036d16415b9b1cd9feea50db4975af1b295631"><code>21036d1</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/422">#422</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/1f3cbfcb0171056b7c92cb01cd131555de1cfa38"><code>1f3cbfc</code></a> Upgrade requirements (<a href="https://redirect.github.com/adamchainz/time-machine/issues/421">#421</a>)</li>
<li><a href="https://github.com/adamchainz/time-machine/commit/36901fe51db82d7855ce8c3557c42d22e0519c26"><code>36901fe</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://redirect.github.com/adamchainz/time-machine/issues/420">#420</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/adamchainz/time-machine/compare/2.13.0...2.14.0">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=time-machine&package-manager=pip&previous-version=2.13.0&new-version=2.14.0)](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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamchainz adamchainz adamchainz 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.
2 participants
@bp72 @adamchainz