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

Better support for complex wheel builds #48

Merged
merged 90 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
5826c51
wip
jvolkman Dec 10, 2022
4c097d1
wip
jvolkman Dec 12, 2022
142b765
wip
jvolkman Dec 12, 2022
0894eb9
Builds numpy
jvolkman Dec 12, 2022
229aa82
Missing file
jvolkman Dec 12, 2022
d419c30
Add -o ARFLAG when using libtool
jvolkman Dec 13, 2022
bb612f8
version updates
jvolkman Dec 13, 2022
decb465
Break up _pycross_wheel_build_impl
jvolkman Dec 13, 2022
aea2bca
Some refactoring
jvolkman Dec 13, 2022
75a96fc
Support specifying path_tools names
jvolkman Dec 14, 2022
ac9f82b
Place tools in their own path
jvolkman Dec 14, 2022
fb41ab0
Change API for pre-build hooks
jvolkman Dec 14, 2022
2950329
Add post-build hooks
jvolkman Dec 14, 2022
e0d17de
wip
jvolkman Dec 15, 2022
99c7881
Build with zig
jvolkman Dec 16, 2022
976459f
wip
jvolkman Dec 16, 2022
87434e2
Get zig to link .sos
jvolkman Dec 17, 2022
5441215
Add patch file
jvolkman Dec 17, 2022
6ef6c45
wip
jvolkman Dec 20, 2022
da67569
Missing file
jvolkman Dec 20, 2022
941c5bb
Cross compile openssl
jvolkman Dec 20, 2022
7e457ee
Builds
jvolkman Dec 20, 2022
c90d2c8
Add docs around patch commands
jvolkman Dec 20, 2022
275d522
blah
jvolkman Dec 21, 2022
a7a2ec2
Remove useless define
jvolkman Dec 21, 2022
3a884eb
openssl 3.0
jvolkman Dec 21, 2022
565671e
Still working
jvolkman Dec 22, 2022
10ea8ec
Still works
jvolkman Dec 22, 2022
d3e02fe
Remove -j8
jvolkman Dec 22, 2022
5c319f3
Work on postgres
jvolkman Dec 22, 2022
50e04b9
Reproducible postgres
jvolkman Dec 22, 2022
d0eabb8
--without-perl
jvolkman Dec 22, 2022
3b09ade
Switch to nightly
jvolkman Dec 23, 2022
fb84ec5
Revert "Switch to nightly"
jvolkman Dec 23, 2022
adba2ae
Cross build psycopg2
jvolkman Dec 26, 2022
86d624c
Working on auditwheel support
jvolkman Dec 28, 2022
b72b9fd
wip
jvolkman Dec 29, 2022
0b7e5e6
wip
jvolkman Dec 29, 2022
563190a
wip
jvolkman Dec 30, 2022
cb8bb95
wip
jvolkman Dec 30, 2022
76b54e3
Working with more bazely cc support
jvolkman Dec 30, 2022
c83389c
refactor
jvolkman Dec 30, 2022
cb44863
Support $(abspath ...)
jvolkman Dec 30, 2022
27f093a
Fix numpy build
jvolkman Dec 30, 2022
e1a0733
Upgrade zig
jvolkman Dec 30, 2022
c1d3a69
Determine targeted glibc ver
jvolkman Dec 30, 2022
ad841ba
wip
jvolkman Dec 30, 2022
a5f5272
Changes
jvolkman Jan 1, 2023
45c5ffd
Use sym_tag
jvolkman Jan 1, 2023
8e9747f
Hook WIP
jvolkman Jan 1, 2023
eb383df
Hook WIP
jvolkman Jan 1, 2023
b35e690
Remove debug crap
jvolkman Jan 3, 2023
b8a5cd4
Merge py 3.11 fixes from upstream
jvolkman Jan 5, 2023
2a9e6f5
Fix cross building openblas
jvolkman Jan 5, 2023
41c7020
Remove auditwheel target
jvolkman Jan 5, 2023
e81e7fe
Add psycopg2 readme
jvolkman Jan 6, 2023
6ccdd1a
typo
jvolkman Jan 6, 2023
9012876
Update README.md
jvolkman Jan 6, 2023
1dea6fe
Add setproctitle
jvolkman Jan 6, 2023
9a3b7f9
Add setproctitle
jvolkman Jan 8, 2023
9653d56
integrate repairwheel
jvolkman Apr 18, 2023
304298e
Version bump and use repairwheel
jvolkman Apr 18, 2023
2d0c3f9
More changes around switch to repairwheel
jvolkman Apr 18, 2023
d728f73
Include additional bazel-zig-cc bugfix
jvolkman Apr 19, 2023
e9c6798
Use relative paths
jvolkman Apr 23, 2023
425ac0d
Patch out usage of --enable-new-dtags
jvolkman Apr 23, 2023
626ca0c
Upgrade zig version
jvolkman Apr 24, 2023
eaf51e2
Fix openblas build on newer zig version
jvolkman Apr 24, 2023
738affe
Build with -c opt
jvolkman Apr 24, 2023
e903a82
Update openblas
jvolkman Apr 24, 2023
9dfc8d2
Fix PYCROSS_ env vars
jvolkman Apr 25, 2023
f2b3dda
Fix numpy build
jvolkman Apr 25, 2023
aff5fa1
Set machine correctly on macos
jvolkman Apr 25, 2023
f796b27
Honor --strip param
jvolkman Apr 25, 2023
7c6cf4e
Fix ordering
jvolkman Apr 26, 2023
a67a2d9
Remove hard-coded debug and strip flags
jvolkman Apr 26, 2023
e692276
updates
jvolkman Apr 26, 2023
f0ac39f
bring back copts and linkopts
Apr 30, 2023
b4c5791
Override sys prefixes
jvolkman May 22, 2023
b8da8c1
Add strip copt
jvolkman May 23, 2023
7ced391
Add strip copt
jvolkman May 23, 2023
0674e54
Downgrade dacite to get lock generation working again
jvolkman Oct 26, 2023
82b3aad
Remove crossenv example which is also handled by external_linking
jvolkman Oct 26, 2023
18e4c56
Bump versions of pip packages
jvolkman Nov 8, 2023
dd3c23c
Docs update
jvolkman Nov 8, 2023
678b180
Update go
jvolkman Nov 8, 2023
86550ca
Update versions in pdm example
jvolkman Nov 8, 2023
64109ed
Update versions in poetry example
jvolkman Nov 8, 2023
c9f1e20
Updates
jvolkman Nov 8, 2023
55d516d
Revert "Update go"
jvolkman Nov 8, 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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
6.0.0rc1
6.4.0
# The first line of this file is used by Bazelisk and Bazel to be sure
# the right version of Bazel is used to build and test this repo.
# This also defines which version is used on CI.
Expand Down
12 changes: 10 additions & 2 deletions docs/rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ pycross_target_environment(<a href="#pycross_target_environment-name">name</a>,
## pycross_wheel_build

<pre>
pycross_wheel_build(<a href="#pycross_wheel_build-name">name</a>, <a href="#pycross_wheel_build-copts">copts</a>, <a href="#pycross_wheel_build-deps">deps</a>, <a href="#pycross_wheel_build-linkopts">linkopts</a>, <a href="#pycross_wheel_build-sdist">sdist</a>, <a href="#pycross_wheel_build-target_environment">target_environment</a>)
pycross_wheel_build(<a href="#pycross_wheel_build-name">name</a>, <a href="#pycross_wheel_build-build_env">build_env</a>, <a href="#pycross_wheel_build-config_settings">config_settings</a>, <a href="#pycross_wheel_build-copts">copts</a>, <a href="#pycross_wheel_build-data">data</a>, <a href="#pycross_wheel_build-deps">deps</a>, <a href="#pycross_wheel_build-linkopts">linkopts</a>, <a href="#pycross_wheel_build-native_deps">native_deps</a>,
<a href="#pycross_wheel_build-path_tools">path_tools</a>, <a href="#pycross_wheel_build-post_build_hooks">post_build_hooks</a>, <a href="#pycross_wheel_build-pre_build_hooks">pre_build_hooks</a>, <a href="#pycross_wheel_build-sdist">sdist</a>, <a href="#pycross_wheel_build-target_environment">target_environment</a>)
</pre>


Expand All @@ -141,9 +142,16 @@ pycross_wheel_build(<a href="#pycross_wheel_build-name">name</a>, <a href="#pycr
| Name | Description | Type | Mandatory | Default |
| :------------- | :------------- | :------------- | :------------- | :------------- |
| <a id="pycross_wheel_build-name"></a>name | A unique name for this target. | <a href="https://bazel.build/concepts/labels#target-names">Name</a> | required | |
| <a id="pycross_wheel_build-build_env"></a>build_env | Environment variables passed to the sdist build. Values are subject to 'Make variable', location, and build_cwd_token expansion. | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | optional | <code>{}</code> |
| <a id="pycross_wheel_build-config_settings"></a>config_settings | PEP 517 config settings passed to the sdist build. Values are subject to 'Make variable', location, and build_cwd_token expansion. | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | optional | <code>{}</code> |
| <a id="pycross_wheel_build-copts"></a>copts | Additional C compiler options. | List of strings | optional | <code>[]</code> |
| <a id="pycross_wheel_build-deps"></a>deps | A list of build dependencies for the wheel. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-data"></a>data | Additional data and dependencies used by the build. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-deps"></a>deps | A list of Python build dependencies for the wheel. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-linkopts"></a>linkopts | Additional C linker options. | List of strings | optional | <code>[]</code> |
| <a id="pycross_wheel_build-native_deps"></a>native_deps | A list of native build dependencies (CcInfo) for the wheel. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-path_tools"></a>path_tools | A mapping of binaries to names that are placed in PATH when building the sdist. | <a href="https://bazel.build/rules/lib/dict">Dictionary: Label -> String</a> | optional | <code>{}</code> |
| <a id="pycross_wheel_build-post_build_hooks"></a>post_build_hooks | A list of binaries that are executed after the wheel is built. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-pre_build_hooks"></a>pre_build_hooks | A list of binaries that are executed prior to building the sdist. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | <code>[]</code> |
| <a id="pycross_wheel_build-sdist"></a>sdist | The sdist file. | <a href="https://bazel.build/concepts/labels">Label</a> | required | |
| <a id="pycross_wheel_build-target_environment"></a>target_environment | The target environment to build for. | <a href="https://bazel.build/concepts/labels">Label</a> | optional | <code>None</code> |

Expand Down
1 change: 1 addition & 0 deletions examples/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.pdm.toml
9 changes: 0 additions & 9 deletions examples/crossenv/README.md

This file was deleted.

95 changes: 0 additions & 95 deletions examples/crossenv/WORKSPACE

This file was deleted.

17 changes: 0 additions & 17 deletions examples/crossenv/deps/BUILD.bazel

This file was deleted.

Loading
Loading