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

Complete type annotations of tests/functional/ directory #10464

Merged
merged 1 commit into from
Nov 19, 2021
Merged

Complete type annotations of tests/functional/ directory #10464

merged 1 commit into from
Nov 19, 2021

Conversation

jdufresne
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 15, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 15, 2021
@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 20, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 21, 2021
@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 21, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 23, 2021
@pradyunsg
Copy link
Member

pradyunsg commented Sep 24, 2021

FWIW, for large PRs like this, I'd encourage you to make commits via commit --fixup and doing a single rebase --autosquash once approved, prior to merging. It makes reviewing the actual changes easier. :)

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 26, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 26, 2021
@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 28, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 30, 2021
@jdufresne
Copy link
Contributor Author

Rebasing required several changes to newly added tests and exposed some too strict or loose types elsewhere. I've tried to contain these in the latest fixup commit.

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Sep 30, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Sep 30, 2021
@pradyunsg
Copy link
Member

God dammit @jdufresne. Quicker at updating PRs than I am at mentioning that there's a merge conflict.

(seriously though, I really really appreciate that you're keeping these PRs upto date)

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Oct 5, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Oct 6, 2021
@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Oct 15, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Oct 15, 2021
@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Oct 21, 2021
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Nov 7, 2021
@jdufresne
Copy link
Contributor Author

Rebased and resolved conflicts.

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Nov 12, 2021
@pradyunsg
Copy link
Member

@jdufresne one last time?

@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Nov 19, 2021
@jdufresne
Copy link
Contributor Author

Resolved conflict in tests/functional/test_install_wheel.py.

@pradyunsg pradyunsg merged commit 4cdb516 into pypa:main Nov 19, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 5, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants