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

Fix Windows build with pyproject.toml #7230

Merged
merged 17 commits into from
Jun 30, 2023

Conversation

nulano
Copy link
Contributor

@nulano nulano commented Jun 24, 2023

Continuation of #7190.
Closes #7190.

Two changes:

  • Use pip install -C raqm=vendor -C fribidi=vendor . instead of calling setup.py directly.
  • Extract the environment setup into a separate script:
    • selecting wheel vs install and passing through pip flags cannot be easily done via a batch script,
    • this change (very slightly) speeds up compilation locally and on AppVeyor,
    • it will enable build caching simplifications after Removed support for 32-bit #7228 is merged.

hugovk and others added 14 commits May 27, 2023 22:40

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
This reverts commit e6d7f1f.

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
Co-authored-by: nulano <nulano@nulano.eu>

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
# Conflicts:
#	pyproject.toml

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
(cherry picked from commit 0e1f86a)

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
(cherry picked from commit 600b823)

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
@radarhere radarhere added this to the 10.0.0 milestone Jun 28, 2023

Verified

This commit was signed with the committer’s verified signature.
albertvillanova Albert Villanova del Moral
@radarhere radarhere requested a review from hugovk June 30, 2023 04:15
Comment on lines +65 to 66
- path: pillow\*.egg
name: egg
Copy link
Member

@hugovk hugovk Jun 30, 2023

Choose a reason for hiding this comment

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

The egg format is newly deprecated on PyPI:

I know we're not uploading these, but do we need them here?

Suggested change
- path: pillow\*.egg
name: egg

(Non-blocking for merge.)

@hugovk
Copy link
Member

hugovk commented Jun 30, 2023

Eggs can wait, let's merge so everything is ready in time for tomorrow's build. 🥚🚀

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants