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

Fix pytest 8 compat #2838

Merged
merged 4 commits into from
Feb 2, 2024
Merged

Fix pytest 8 compat #2838

merged 4 commits into from
Feb 2, 2024

Conversation

flying-sheep
Copy link
Member

@flying-sheep flying-sheep commented Jan 29, 2024

  • Release notes not necessary because: dev change

Changes:

@flying-sheep flying-sheep added this to the 1.9.9 milestone Jan 29, 2024
@flying-sheep flying-sheep self-assigned this Jan 29, 2024
Copy link

codecov bot commented Jan 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8986921) 72.85% compared to head (d184a9f) 73.67%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2838      +/-   ##
==========================================
+ Coverage   72.85%   73.67%   +0.82%     
==========================================
  Files         111      111              
  Lines       12383    12386       +3     
==========================================
+ Hits         9022     9126     +104     
+ Misses       3361     3260     -101     
Files Coverage Δ
scanpy/testing/_doctests.py 80.00% <100.00%> (ø)
scanpy/testing/_pytest/__init__.py 100.00% <100.00%> (ø)
scanpy/testing/_pytest/fixtures/__init__.py 96.66% <100.00%> (ø)

... and 2 files with indirect coverage changes

@flying-sheep flying-sheep merged commit 330a099 into master Feb 2, 2024
17 checks passed
@flying-sheep flying-sheep deleted the pytest-8-compat branch February 2, 2024 07:49
Copy link

lumberbot-app bot commented Feb 2, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.9.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 330a099ffe76286f0f047387701af7e9fd58831a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2838: Fix pytest 8 compat'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2838-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2838 on branch 1.9.x (Fix pytest 8 compat)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Copy link

lumberbot-app bot commented Feb 2, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.9.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 330a099ffe76286f0f047387701af7e9fd58831a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2838: Fix pytest 8 compat'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2838-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2838 on branch 1.9.x (Fix pytest 8 compat)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pytest 8 compatibility
1 participant