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

explicit use of fixture decorator #1783

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

miguelgrinberg
Copy link
Collaborator

This was one of the last suggestions in #1782, to use explicit @pytest.fixture and @pytest_asyncio.fixture decorators. I inadvertently left this change out of that PR, so here it is.

Copy link
Member

@pquentin pquentin left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM.

@miguelgrinberg miguelgrinberg merged commit ff406e9 into elastic:main Apr 25, 2024
15 checks passed
@miguelgrinberg miguelgrinberg deleted the better-fixture-import branch April 25, 2024 10:01
@miguelgrinberg miguelgrinberg added the backport 8.x Backport to 8.x label Apr 29, 2024
Copy link

The backport to 8.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.x 8.x
# Navigate to the new working tree
cd .worktrees/backport-8.x
# Create a new branch
git switch --create backport-1783-to-8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ff406e9a09ee0dc39dc75693c86f80de43540b1b
# Push it to GitHub
git push --set-upstream origin backport-1783-to-8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.x

Then, create a pull request where the base branch is 8.x and the compare/head branch is backport-1783-to-8.x.

miguelgrinberg added a commit to miguelgrinberg/elasticsearch-dsl-py that referenced this pull request Apr 29, 2024
miguelgrinberg added a commit that referenced this pull request Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 8.x Backport to 8.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants