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 check release by ignoring duplicate file name in wheel #1163

Merged
merged 1 commit into from Jan 4, 2023

Conversation

blink1073
Copy link
Collaborator

Handles:

installing check-wheel-contents...
dist/jupyter_server-2.0.7-py3-none-any.whl: W002: Wheel contains duplicate files:
  jupyter_server/static/favicon.ico
  jupyter_server/static/favicons/favicon.ico

@blink1073 blink1073 changed the title Fix check release Fix check release by ignoring duplicate file name in wheel Jan 4, 2023
@codecov
Copy link

codecov bot commented Jan 4, 2023

Codecov Report

Base: 79.93% // Head: 79.89% // Decreases project coverage by -0.03% ⚠️

Coverage data is based on head (c62c629) compared to base (88c9339).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1163      +/-   ##
==========================================
- Coverage   79.93%   79.89%   -0.04%     
==========================================
  Files          68       68              
  Lines        8099     8099              
  Branches     1599     1599              
==========================================
- Hits         6474     6471       -3     
- Misses       1202     1204       +2     
- Partials      423      424       +1     
Impacted Files Coverage Δ
jupyter_server/extension/handler.py 67.69% <0.00%> (-1.54%) ⬇️
jupyter_server/gateway/managers.py 83.13% <0.00%> (-0.24%) ⬇️
jupyter_server/serverapp.py 80.08% <0.00%> (-0.09%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@blink1073 blink1073 merged commit a6dea1b into jupyter-server:main Jan 4, 2023
@blink1073 blink1073 deleted the fix-check-release branch January 4, 2023 13:53
@blink1073
Copy link
Collaborator Author

@meeseeksdev please backport to 1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 6, 2023

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.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 a6dea1b0145d76e99521d387c6415e817d9e0a36
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1163: Fix check release by ignoring duplicate file name in wheel'
  1. Push to a named branch:
git push YOURFORK 1.x:auto-backport-of-pr-1163-on-1.x
  1. Create a PR against branch 1.x, I would have named this PR:

"Backport PR #1163 on branch 1.x (Fix check release by ignoring duplicate file name in wheel)"

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.

None yet

1 participant