Skip to content

Commit

Permalink
Add back 32-bit builds for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
ofek committed Mar 6, 2024
1 parent 67423d4 commit 9ae1d43
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-hatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ jobs:
# Windows
- target: x86_64-pc-windows-msvc
os: windows-2022
- target: i686-pc-windows-msvc
os: windows-2022
# macOS
- target: aarch64-apple-darwin
os: macos-12
Expand Down
1 change: 1 addition & 0 deletions docs/history/hatch.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add `self report` command for submitting pre-populated bug reports to GitHub
- The reserved environment used for static analysis is now completely configurable
- Add the following methods to the `environment` interface for complete control over output during life cycle management: `app_status_creation`, `app_status_pre_installation`, `app_status_post_installation`, `app_status_project_installation`, `app_status_dependency_state_check`, `app_status_dependency_installation_check`, `app_status_dependency_synchronization`
- Add binaries for 32-bit versions of Windows
- Upgrade default CPython distributions to 20240107
- Upgrade Ruff to 0.2.2
- Upgrade PyApp to 0.15.1 for binary builds
Expand Down
5 changes: 5 additions & 0 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
```
msiexec /passive /i https://github.com/pypa/hatch/releases/download/hatch-v<HATCH_LATEST_VERSION>/hatch-<HATCH_LATEST_VERSION>-x64.msi
```
=== "x86"
```
msiexec /passive /i https://github.com/pypa/hatch/releases/download/hatch-v<HATCH_LATEST_VERSION>/hatch-<HATCH_LATEST_VERSION>-x86.msi
```
2. Restart your terminal.
3. To verify that the shell can find and run the `hatch` command in your `PATH`, use the following command.

Expand All @@ -78,6 +82,7 @@ After downloading the archive corresponding to your platform and architecture, e

=== "Windows"
- [hatch-<HATCH_LATEST_VERSION>-x86_64-pc-windows-msvc.zip](https://github.com/pypa/hatch/releases/download/hatch-v<HATCH_LATEST_VERSION>/hatch-<HATCH_LATEST_VERSION>-x86_64-pc-windows-msvc.zip)
- [hatch-<HATCH_LATEST_VERSION>-i686-pc-windows-msvc.zip](https://github.com/pypa/hatch/releases/download/hatch-v<HATCH_LATEST_VERSION>/hatch-<HATCH_LATEST_VERSION>-i686-pc-windows-msvc.zip)

## pip

Expand Down
8 changes: 8 additions & 0 deletions pyoxidizer.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ AUTHOR = "Python Packaging Authority"
def make_msi(target):
if target == "x86_64-pc-windows-msvc":
arch = "x64"
elif target == "i686-pc-windows-msvc":
arch = "x86"
else:
arch = "unknown"

Expand Down Expand Up @@ -46,12 +48,18 @@ def make_exe_installer():
)

bundle.add_vc_redistributable("x64")
bundle.add_vc_redistributable("x86")

bundle.add_wix_msi_builder(
builder=make_msi("x86_64-pc-windows-msvc"),
display_internal_ui=True,
install_condition="VersionNT64",
)
bundle.add_wix_msi_builder(
builder=make_msi("i686-pc-windows-msvc"),
display_internal_ui=True,
install_condition="Not VersionNT64",
)

return bundle

Expand Down

0 comments on commit 9ae1d43

Please sign in to comment.