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

Add mypy.ini, mypy-zope-plugin #357

Merged
merged 24 commits into from
Jun 15, 2021
Merged

Add mypy.ini, mypy-zope-plugin #357

merged 24 commits into from
Jun 15, 2021

Conversation

H-Shay
Copy link
Contributor

@H-Shay H-Shay commented Jun 8, 2021

This PR adds a mypy.ini file, and specifies modules which are missing type support to be ignored. It also adds the mypy-zope plugin, and fixes a mypy error in utils/emailutils per this convo: #355 (comment)

signed off by H-Shay, shaysquared@gmail.com

@H-Shay
Copy link
Contributor Author

H-Shay commented Jun 9, 2021

I see that I have to rebase this once 355 is merged and force push it as there are commits from 355 in here-this is because I based it on a branch that has not been merged, correct?

@H-Shay
Copy link
Contributor Author

H-Shay commented Jun 9, 2021

hopefully this is good to go!

mypy.ini Outdated Show resolved Hide resolved
Copy link
Contributor

@callahad callahad left a comment

Choose a reason for hiding this comment

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

It would also be great if you could make a final commit in here with git commit --signoff to automatically add in the Signed-off-by: ... line to the commit message

setup.py Outdated Show resolved Hide resolved
Signed-off-by: H.Shay <shaysquared@gmail.com>
@callahad
Copy link
Contributor

Looks good to me! So sorry for the pedantry, but one final change to request: could you please split the changes to sydent/util/emailutils.py into their own pull request, so this one's changelog can just be about adding mypy configuration?

Copy link
Contributor

@callahad callahad left a comment

Choose a reason for hiding this comment

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

...and a few other comments

pyproject.toml Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
@callahad callahad mentioned this pull request Jun 15, 2021
@H-Shay
Copy link
Contributor Author

H-Shay commented Jun 15, 2021

Question re: this comment: #357 (comment)
I cherrypicked the commit in question and added it to a new branch, then opened a PR on that new branch. As far as this branch is concerned, does it makes sense to
a. wait until the new PR is approved and update this branch once it is (which I am assuming will cause a merge conflict which could be easily resolved) or
b. try and revert the commit in question (using the hash/id) so it is no longer on this branch, and then updating this PR?
Option 'a' seems a little saner but not sure of what is best practice...

@callahad
Copy link
Contributor

Let's go with reverting e618512 here

@callahad
Copy link
Contributor

For small PRs, or ones that haven't been reviewed yet, it's common to use git rebase --interactive origin/main to replay all of the commits on origin/main but with the option of re-ordering them, skipping some, editing others, etc. But once it's been reviewed, rebasing can make it more challenging to know what's changed since the last review, etc.

@callahad
Copy link
Contributor

Otherwise, consider this 👍 once that revert happens :)

… change was moved

to another PR.

This reverts commit e618512.
@callahad callahad merged commit 56fbed0 into matrix-org:main Jun 15, 2021
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.

2 participants