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

Include pyproject.toml in sdist #1634

Merged
merged 4 commits into from
Jan 27, 2019
Merged

Conversation

daa
Copy link
Contributor

@daa daa commented Jan 11, 2019

Summary of changes

Include pyproject.toml in source distribution if it is present.
Closes #1632

Pull Request Checklist

  • Changes have tests
  • News fragment added in changelog.d. See documentation for details

@jaraco
Copy link
Member

jaraco commented Jan 27, 2019

Gah. This PR seemed like a pretty innocuous request, and since the tests had passed, I merged it. But now I see this change causes tests to fail in master when pip 19 is present (now that setuptools' own pyproject.toml is now present). This is another manifestation of #1644.

@pganssle
Copy link
Member

@jaraco Is this included in a release yet?

I think this shouldn't be included in any release unless that release also handles the "default PEP 517 backend" issue.

@jaraco
Copy link
Member

jaraco commented Jan 27, 2019

It is not.

@jaraco
Copy link
Member

jaraco commented Jan 27, 2019

This merge is the last thing on master. I'm going to force-push master back to its prior state.

@jaraco
Copy link
Member

jaraco commented Jan 27, 2019

setuptools master $ git push -f origin 97e8a:master                                                                                                                                      
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/pypa/setuptools
 + 7a4a99a3...97e8ad4f 97e8a -> master (forced update)

@jaraco
Copy link
Member

jaraco commented Jan 27, 2019

If you'd pulled the latest master, please on master: git fetch origin master; git reset --hard origin/master.

@jaraco jaraco mentioned this pull request Jan 27, 2019
2 tasks
@daa daa deleted the pyproject.toml-in-sdist branch January 28, 2019 07:26
@daa daa restored the pyproject.toml-in-sdist branch January 28, 2019 07:26
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.

3 participants