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.

Sign up for GitHub

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
Merged

Fix Windows build with pyproject.toml #7230

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
26e0c81
Revert "Install setuptools on Windows"
hugovk May 27, 2023
454dfcc
Add minimal pyproject.toml
hugovk May 27, 2023
18960e8
Use latest setuptools 67.8
hugovk May 27, 2023
9ea7721
Replace direct invocation of setup.py
hugovk May 27, 2023
3a0881d
Disable extra quotes
hugovk May 27, 2023
58b8d6c
Upgrade pip
hugovk May 27, 2023
7f0c49a
Move pip upgrade to .appveyor.yml
hugovk May 28, 2023
d5e03cc
Wrap arguments before passing
hugovk May 28, 2023
c068af7
Merge remote-tracking branch 'upstream/main' into add-pyproject.toml
nulano Jun 24, 2023
5d0e37e
use --config-settings when building on Windows
nulano Jun 24, 2023
466aa7e
update winbuild documentation
nulano Jun 24, 2023
14ae3e4
Updated pyproject-fmt to 0.12.1
radarhere Jun 24, 2023
25c24a8
Removed unused code
radarhere Jun 24, 2023
c179962
lint fixes
nulano Jun 24, 2023
10ad87c
Merge branch 'main' into add-pyproject.toml
radarhere Jun 24, 2023
fec793d
don't explicitly install wheel
nulano Jun 25, 2023
b2d7f1e
Merge branch 'main' into add-pyproject.toml
radarhere Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Disable extra quotes
  • Loading branch information
@hugovk
hugovk committed May 27, 2023
commit 3a0881dffe589fe745ccc6f68f4b2b74cf72f15e
9 changes: 1 addition & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,7 @@ def build_extensions(self):
if struct.unpack("h", b"\0\1")[0] == 1:
defs.append(("WORDS_BIGENDIAN", None))

if (
sys.platform == "win32"
and sys.version_info < (3, 9)
and not (PLATFORM_PYPY or PLATFORM_MINGW)
):
defs.append(("PILLOW_VERSION", f'"\\"{PILLOW_VERSION}\\""'))
else:
defs.append(("PILLOW_VERSION", f'"{PILLOW_VERSION}"'))
defs.append(("PILLOW_VERSION", f'"{PILLOW_VERSION}"'))

self._update_extension("PIL._imaging", libs, defs)

Expand Down