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

Proposal: absorb django-filter-stubs into typeshed #10918

Open
intgr opened this issue Oct 19, 2023 · 2 comments · May be fixed by #10919
Open

Proposal: absorb django-filter-stubs into typeshed #10918

intgr opened this issue Oct 19, 2023 · 2 comments · May be fixed by #10919

Comments

@intgr
Copy link
Contributor

intgr commented Oct 19, 2023

The django-filter-stubs project has has signalled that they want to be merged into typeshed, project author @DavisRayM agreeing with it: DavisRayM/django-filter-stubs#13

I'm interested in implementing this.

I propose we do this in a way that preserves original commits and authorship information. I can do some git magic to "transplant" upstream commits to this repo, in the correct directory structure, but skipping changes/commits that don't touch .pyi files. And then you can merge that without squashing.

But if you want to squash merge and aren't interested in preserving history, then let me know and I won't bother with that.

@AlexWaygood
Copy link
Member

AlexWaygood commented Oct 19, 2023

Preserving history sounds like a good idea to me, if it's possible.

Merge commits aren't enabled for this repository (the only two enabled ways of merging are "squash and merge" and "rebase and merge"), but I think repo admins might be able to override that? (I'm not a repo admin, so can't say for sure.)

@srittau
Copy link
Collaborator

srittau commented Oct 19, 2023

We can enable merge commits when needed. (Sidenote: I just deleted a webhook that was still pointing to travis-ci, but not surprisingly failing.)

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 a pull request may close this issue.

3 participants