-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
PR: Temporary fix for function test_no_empty_file_items
#19617
PR: Temporary fix for function test_no_empty_file_items
#19617
Conversation
test_no_empty_file_items
What's with this sphinxcontrib error in the MacOS app test? |
I think maybe some packages got new releases and those are incompatible with the way the MacOS installer is build. So that error is unrelated with the changes here |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the help with this @stevetracvc ! This LGTM and the failing check seems unrelated with this 👍
However, just in case, is okay if we merge this without taking into account the failing MacOS installer build check @ccordoba12 ?
Also @stevetracvc could you rebase this change on top of the |
f55bd99
to
a24fbfe
Compare
@dalthviz I think I rebased it correctly...I'm not the greatest with git. It still says master at the top. Last time I just redid the PR hah |
Thanks @stevetracvc , I think the rebase worked! I changed the base branch on this PR at the top and it still shows just one file as modified 👍 Seems like your git-fu has improved :) |
Note: This needs a new rebase on top of |
looks like the results of findinfiles.find() aren't deterministic
a24fbfe
to
6e05242
Compare
OK, I think I did that, and the sphinx issue is gone. Is there a better way than me doing
I don't like the force push part, is there a better way? And I'll need to do it with my other active PR too, once this one gets merged, so that it can pass all tests. |
Thanks @stevetracvc for your patience with this! And yes that's the way to do it in case you update your PR with a rebase 👍 Regarding the force push, it's needed due to the rebase (which changes the git commit history). The other way to achive synchronization is by merging but then if you already have work done, a merge commit will be put in the history. In such a case, you can just push (so no need of force push since you are just adding the merge commit to the history). And yes, after this PR gets merged, all the other open PRs will need to either rebase on top the latest 5.x or merge with the latest 5.x to get the changes here and then be able to pass the checks |
looks like the results of findinfiles.find() aren't deterministic and it's causing test_no_empty_file_items to fail
Description of Changes
Issue(s) Resolved
Fixes #19602
Affirmation
By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.
I certify the above statement is true and correct:
stevetracvc