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

[10317] Fix a typo in GlibReactorBaseTests #1706

Merged
merged 3 commits into from Apr 2, 2022
Merged

[10317] Fix a typo in GlibReactorBaseTests #1706

merged 3 commits into from Apr 2, 2022

Conversation

yan12125
Copy link
Contributor

Scope and purpose

Fix a typo in GlibReactorBaseTests

Contributor Checklist:

  • The associated ticket in Trac is here: https://twistedmatrix.com/trac/ticket/10317
  • I ran tox -e lint to format my patch to meet the Twisted Coding Standard
  • I have created a newsfragment in src/twisted/newsfragments/ (see: News files)
  • The title of the PR starts with the associated Trac ticket number (without the # character).
  • I have updated the automated tests and checked that all checks for the PR are green.
  • I have submitted the associated Trac ticket for review by adding the word review to the keywords field in Trac, and putting a link to this PR in the comment; it shows up in https://twisted.reviews/ now.
  • The merge commit will use the below format
    The first line is automatically generated by GitHub based on PR ID and branch name.
    The other lines generated by GitHub should be replaced.
Merge pull request #1705 from yan12125/10317-fix-GlibReactorBaseTests

Author: yan12125
Reviewer: <github_username>, <github_username_if_more_reviewers>
Fixes: ticket:10317

Fix a typo in GlibReactorBaseTests

Copy link
Member

@exarkun exarkun left a comment

Choose a reason for hiding this comment

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

Thanks. This looks good to me. I reproduced the failures in my local dev env and saw that the change turns those tests green.

CI is partly red but that looks like it's due to unrelated problems with unpinned dependencies, not a problem with this change.

@yan12125
Copy link
Contributor Author

yan12125 commented Apr 1, 2022

Indeed, looks like installed black is incompatible with click: (from https://github.com/twisted/twisted/runs/5792142299)

2022-04-01T17:41:11.1751657Z Traceback (most recent call last):
2022-04-01T17:41:11.1760569Z   File "/home/runner/.cache/pre-commit/repo6v4iperk/py_env-python3/bin/black", line 8, in <module>
2022-04-01T17:41:11.1761009Z     sys.exit(patched_main())
2022-04-01T17:41:11.1761711Z   File "/home/runner/.cache/pre-commit/repo6v4iperk/py_env-python3/lib/python3.9/site-packages/black/__init__.py", line 1129, in patched_main
2022-04-01T17:41:11.1762072Z     patch_click()
2022-04-01T17:41:11.1762633Z   File "/home/runner/.cache/pre-commit/repo6v4iperk/py_env-python3/lib/python3.9/site-packages/black/__init__.py", line 1115, in patch_click
2022-04-01T17:41:11.1763048Z     from click import _unicodefun  # type: ignore
2022-04-01T17:41:11.1763665Z ImportError: cannot import name '_unicodefun' from 'click' (/home/runner/.cache/pre-commit/repo6v4iperk/py_env-python3/lib/python3.9/site-packages/click/__init__.py)

The issue appears to have been fixed with the latest black (psf/black#2964)

@adiroiban
Copy link
Member

Thanks. Let's see if black is happy and I will merge this.

It would have been nice to have the GI reactor tests executed as part of our CI...but there is no point in blocking this PR for that.

@yan12125 if you care about Twisted and GTK/GI consider sending another PR in which the tests are executed on our CI ... for example don't skip the tests if we are running on Ubuntu and GitHub actions. let me know if you need help with that.

@adiroiban adiroiban enabled auto-merge April 2, 2022 12:45
@adiroiban adiroiban merged commit de8e5a6 into twisted:trunk Apr 2, 2022
@yan12125
Copy link
Contributor Author

yan12125 commented Apr 2, 2022

if you care about Twisted and GTK/GI consider sending another PR in which the tests are executed on our CI

Sure, let me have a try.

@yan12125 yan12125 deleted the 10317-fix-GlibReactorBaseTests branch April 2, 2022 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants