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

Include pyproject.toml in sdist #1634

merged 4 commits into from Jan 27, 2019

Conversation

@daa
Copy link
Contributor

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 jaraco merged commit 7a4a99a into pypa:master Jan 27, 2019
4 checks passed
4 checks passed
Mergify — Summary 1 potential rule
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
@jaraco

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

pganssle commented Jan 27, 2019

@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

This comment has been minimized.

Copy link
Member

jaraco commented Jan 27, 2019

It is not.

@jaraco

This comment has been minimized.

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

This comment has been minimized.

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

This comment has been minimized.

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 of 2 tasks complete
@daa daa deleted the daa:pyproject.toml-in-sdist branch Jan 28, 2019
@daa daa restored the daa:pyproject.toml-in-sdist branch Jan 28, 2019
@jaraco jaraco mentioned this pull request Dec 29, 2019
2 of 2 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.