Skip to content

Avoid using $HOME/.cargo when installing poetry by using CargoPythonBundle easyblock #22257

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

Merged
Micket merged 3 commits into from
Feb 12, 2025
Merged

Avoid using $HOME/.cargo when installing poetry by using CargoPythonBundle easyblock #22257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef16708
Avoid using $HOME/.cargo in poetry build
Flamefire Feb 4, 2025
c56b88e
Add CI test for using Cargo* easyblock for Python package/bundles usi…
Flamefire Feb 5, 2025
83ea512
Use CargoPythonBundle
Flamefire Feb 5, 2025
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
82 changes: 81 additions & 1 deletion easybuild/easyconfigs/p/poetry/poetry-1.7.1-GCCcore-12.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
easyblock = 'PythonBundle'
easyblock = 'CargoPythonBundle'

name = 'poetry'
version = '1.7.1'
Expand All @@ -23,6 +23,86 @@ dependencies = [
('virtualenv', '20.23.1'),
]

crates = [
('archery', '1.1.0'),
('autocfg', '1.1.0'),
('bitflags', '1.3.2'),
('cfg-if', '1.0.0'),
('heck', '0.4.1'),
('indoc', '2.0.4'),
('libc', '0.2.147'),
('lock_api', '0.4.10'),
('memoffset', '0.9.0'),
('once_cell', '1.18.0'),
('parking_lot', '0.12.1'),
('parking_lot_core', '0.9.8'),
('proc-macro2', '1.0.66'),
('pyo3', '0.20.2'),
('pyo3-build-config', '0.20.2'),
('pyo3-ffi', '0.20.2'),
('pyo3-macros', '0.20.2'),
('pyo3-macros-backend', '0.20.2'),
('quote', '1.0.31'),
('redox_syscall', '0.3.5'),
('rpds', '1.1.0'),
('scopeguard', '1.1.0'),
('smallvec', '1.11.0'),
('static_assertions', '1.1.0'),
('syn', '2.0.32'),
('target-lexicon', '0.12.9'),
('triomphe', '0.1.9'),
('unicode-ident', '1.0.11'),
('unindent', '0.2.3'),
('windows-targets', '0.48.1'),
('windows_aarch64_gnullvm', '0.48.0'),
('windows_aarch64_msvc', '0.48.0'),
('windows_i686_gnu', '0.48.0'),
('windows_i686_msvc', '0.48.0'),
('windows_x86_64_gnu', '0.48.0'),
('windows_x86_64_gnullvm', '0.48.0'),
('windows_x86_64_msvc', '0.48.0'),
]

checksums = [
{'archery-1.1.0.tar.gz': '487955f60962765486ce000015a3492ca45c34a2ebbf12bc0aa2b5110ca6e7d2'},
{'autocfg-1.1.0.tar.gz': 'd468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa'},
{'bitflags-1.3.2.tar.gz': 'bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a'},
{'cfg-if-1.0.0.tar.gz': 'baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd'},
{'heck-0.4.1.tar.gz': '95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8'},
{'indoc-2.0.4.tar.gz': '1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8'},
{'libc-0.2.147.tar.gz': 'b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3'},
{'lock_api-0.4.10.tar.gz': 'c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16'},
{'memoffset-0.9.0.tar.gz': '5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c'},
{'once_cell-1.18.0.tar.gz': 'dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d'},
{'parking_lot-0.12.1.tar.gz': '3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f'},
{'parking_lot_core-0.9.8.tar.gz': '93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447'},
{'proc-macro2-1.0.66.tar.gz': '18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9'},
{'pyo3-0.20.2.tar.gz': '9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0'},
{'pyo3-build-config-0.20.2.tar.gz': '07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be'},
{'pyo3-ffi-0.20.2.tar.gz': 'dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1'},
{'pyo3-macros-0.20.2.tar.gz': '05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3'},
{'pyo3-macros-backend-0.20.2.tar.gz': '0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f'},
{'quote-1.0.31.tar.gz': '5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0'},
{'redox_syscall-0.3.5.tar.gz': '567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29'},
{'rpds-1.1.0.tar.gz': 'a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4'},
{'scopeguard-1.1.0.tar.gz': 'd29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd'},
{'smallvec-1.11.0.tar.gz': '62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9'},
{'static_assertions-1.1.0.tar.gz': 'a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f'},
{'syn-2.0.32.tar.gz': '239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2'},
{'target-lexicon-0.12.9.tar.gz': 'df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0'},
{'triomphe-0.1.9.tar.gz': '0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f'},
{'unicode-ident-1.0.11.tar.gz': '301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c'},
{'unindent-0.2.3.tar.gz': 'c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce'},
{'windows-targets-0.48.1.tar.gz': '05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f'},
{'windows_aarch64_gnullvm-0.48.0.tar.gz': '91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc'},
{'windows_aarch64_msvc-0.48.0.tar.gz': 'b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3'},
{'windows_i686_gnu-0.48.0.tar.gz': '622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241'},
{'windows_i686_msvc-0.48.0.tar.gz': '4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00'},
{'windows_x86_64_gnu-0.48.0.tar.gz': 'ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1'},
{'windows_x86_64_gnullvm-0.48.0.tar.gz': '7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953'},
{'windows_x86_64_msvc-0.48.0.tar.gz': '1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a'},
]

use_pip = True
sanity_pip_check = True

Expand Down
83 changes: 82 additions & 1 deletion easybuild/easyconfigs/p/poetry/poetry-1.8.3-GCCcore-13.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
easyblock = 'PythonBundle'
easyblock = 'CargoPythonBundle'

name = 'poetry'
version = '1.8.3'
Expand All @@ -25,6 +25,87 @@ dependencies = [
('virtualenv', '20.26.2'),
]

crates = [
('archery', '1.2.0'),
('autocfg', '1.1.0'),
('bitflags', '1.3.2'),
('cfg-if', '1.0.0'),
('heck', '0.4.1'),
('indoc', '2.0.4'),
('libc', '0.2.147'),
('lock_api', '0.4.10'),
('memoffset', '0.9.0'),
('once_cell', '1.18.0'),
('parking_lot', '0.12.1'),
('parking_lot_core', '0.9.8'),
('portable-atomic', '1.6.0'),
('proc-macro2', '1.0.66'),
('pyo3', '0.20.3'),
('pyo3-build-config', '0.20.3'),
('pyo3-ffi', '0.20.3'),
('pyo3-macros', '0.20.3'),
('pyo3-macros-backend', '0.20.3'),
('quote', '1.0.31'),
('redox_syscall', '0.3.5'),
('rpds', '1.1.0'),
('scopeguard', '1.1.0'),
('smallvec', '1.11.0'),
('static_assertions', '1.1.0'),
('syn', '2.0.32'),
('target-lexicon', '0.12.9'),
('triomphe', '0.1.9'),
('unicode-ident', '1.0.11'),
('unindent', '0.2.3'),
('windows-targets', '0.48.1'),
('windows_aarch64_gnullvm', '0.48.0'),
('windows_aarch64_msvc', '0.48.0'),
('windows_i686_gnu', '0.48.0'),
('windows_i686_msvc', '0.48.0'),
('windows_x86_64_gnu', '0.48.0'),
('windows_x86_64_gnullvm', '0.48.0'),
('windows_x86_64_msvc', '0.48.0'),
]
checksums = [
{'archery-1.2.0.tar.gz': '8967cd1cc9e9e1954f644e14fbd6042fe9a37da96c52a67e44a2ac18261f8561'},
{'autocfg-1.1.0.tar.gz': 'd468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa'},
{'bitflags-1.3.2.tar.gz': 'bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a'},
{'cfg-if-1.0.0.tar.gz': 'baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd'},
{'heck-0.4.1.tar.gz': '95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8'},
{'indoc-2.0.4.tar.gz': '1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8'},
{'libc-0.2.147.tar.gz': 'b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3'},
{'lock_api-0.4.10.tar.gz': 'c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16'},
{'memoffset-0.9.0.tar.gz': '5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c'},
{'once_cell-1.18.0.tar.gz': 'dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d'},
{'parking_lot-0.12.1.tar.gz': '3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f'},
{'parking_lot_core-0.9.8.tar.gz': '93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447'},
{'portable-atomic-1.6.0.tar.gz': '7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0'},
{'proc-macro2-1.0.66.tar.gz': '18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9'},
{'pyo3-0.20.3.tar.gz': '53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233'},
{'pyo3-build-config-0.20.3.tar.gz': 'deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7'},
{'pyo3-ffi-0.20.3.tar.gz': '62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa'},
{'pyo3-macros-0.20.3.tar.gz': '7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158'},
{'pyo3-macros-backend-0.20.3.tar.gz': '7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185'},
{'quote-1.0.31.tar.gz': '5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0'},
{'redox_syscall-0.3.5.tar.gz': '567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29'},
{'rpds-1.1.0.tar.gz': 'a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4'},
{'scopeguard-1.1.0.tar.gz': 'd29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd'},
{'smallvec-1.11.0.tar.gz': '62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9'},
{'static_assertions-1.1.0.tar.gz': 'a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f'},
{'syn-2.0.32.tar.gz': '239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2'},
{'target-lexicon-0.12.9.tar.gz': 'df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0'},
{'triomphe-0.1.9.tar.gz': '0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f'},
{'unicode-ident-1.0.11.tar.gz': '301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c'},
{'unindent-0.2.3.tar.gz': 'c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce'},
{'windows-targets-0.48.1.tar.gz': '05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f'},
{'windows_aarch64_gnullvm-0.48.0.tar.gz': '91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc'},
{'windows_aarch64_msvc-0.48.0.tar.gz': 'b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3'},
{'windows_i686_gnu-0.48.0.tar.gz': '622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241'},
{'windows_i686_msvc-0.48.0.tar.gz': '4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00'},
{'windows_x86_64_gnu-0.48.0.tar.gz': 'ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1'},
{'windows_x86_64_gnullvm-0.48.0.tar.gz': '7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953'},
{'windows_x86_64_msvc-0.48.0.tar.gz': '1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a'},
]

use_pip = True
sanity_pip_check = True

Expand Down
6 changes: 6 additions & 0 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,12 @@ def test_pr_python_packages(self):
if not sanity_pip_check and not any(re.match(regex, ec_fn) for regex in whitelist_pip_check):
failing_checks.append("sanity_pip_check should be enabled in %s" % ec_fn)

# When using Rust it should use CargoPython*
if easyblock in ('PythonBundle', 'PythonPackage'):
if any(dep['name'] == 'Rust' or '-Rust-' in dep['versionsuffix'] for dep in ec.dependencies()):
failing_checks.append('Use Cargo%s instead of %s when Rust is used in %s'
% (easyblock, easyblock, ec_fn))

if failing_checks:
self.fail('\n'.join(failing_checks))

Expand Down