Skip to content

Commit c43994b

Browse files
authored
Merge pull request #22983 from boegel/20250531113359_new_pr_maturin110
make Rust a build dependency for maturin 1.1.0 (2023a generation)
2 parents 9a0cb27 + f21d6b6 commit c43994b

File tree

6 files changed

+1585
-6
lines changed

6 files changed

+1585
-6
lines changed

easybuild/easyconfigs/j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
easyblock = 'PythonBundle'
1+
easyblock = 'CargoPythonBundle'
22

33
name = 'jupyter-server'
44
version = "2.7.2"
@@ -12,6 +12,7 @@ toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
1212

1313
builddependencies = [
1414
('binutils', '2.40'),
15+
('Rust', '1.70.0'),
1516
('maturin', '1.1.0'),
1617
]
1718
dependencies = [
@@ -24,6 +25,81 @@ dependencies = [
2425
('tornado', '6.3.2'),
2526
]
2627

28+
crates = [
29+
('archery', '0.5.0'),
30+
('autocfg', '1.1.0'),
31+
('bitflags', '1.3.2'),
32+
('cfg-if', '1.0.0'),
33+
('indoc', '1.0.9'),
34+
('libc', '0.2.147'),
35+
('lock_api', '0.4.10'),
36+
('memoffset', '0.9.0'),
37+
('once_cell', '1.18.0'),
38+
('parking_lot', '0.12.1'),
39+
('parking_lot_core', '0.9.8'),
40+
('proc-macro2', '1.0.66'),
41+
('pyo3', '0.19.1'),
42+
('pyo3-build-config', '0.19.1'),
43+
('pyo3-ffi', '0.19.1'),
44+
('pyo3-macros', '0.19.1'),
45+
('pyo3-macros-backend', '0.19.1'),
46+
('quote', '1.0.31'),
47+
('redox_syscall', '0.3.5'),
48+
('rpds', '0.13.0'),
49+
('scopeguard', '1.1.0'),
50+
('smallvec', '1.11.0'),
51+
('static_assertions', '1.1.0'),
52+
('syn', '1.0.109'),
53+
('target-lexicon', '0.12.9'),
54+
('unicode-ident', '1.0.11'),
55+
('unindent', '0.1.11'),
56+
('windows-targets', '0.48.1'),
57+
('windows_aarch64_gnullvm', '0.48.0'),
58+
('windows_aarch64_msvc', '0.48.0'),
59+
('windows_i686_gnu', '0.48.0'),
60+
('windows_i686_msvc', '0.48.0'),
61+
('windows_x86_64_gnu', '0.48.0'),
62+
('windows_x86_64_gnullvm', '0.48.0'),
63+
('windows_x86_64_msvc', '0.48.0'),
64+
]
65+
checksums = [
66+
{'archery-0.5.0.tar.gz': 'b6cd774058b1b415c4855d8b86436c04bf050c003156fe24bc326fb3fe75c343'},
67+
{'autocfg-1.1.0.tar.gz': 'd468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa'},
68+
{'bitflags-1.3.2.tar.gz': 'bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a'},
69+
{'cfg-if-1.0.0.tar.gz': 'baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd'},
70+
{'indoc-1.0.9.tar.gz': 'bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306'},
71+
{'libc-0.2.147.tar.gz': 'b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3'},
72+
{'lock_api-0.4.10.tar.gz': 'c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16'},
73+
{'memoffset-0.9.0.tar.gz': '5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c'},
74+
{'once_cell-1.18.0.tar.gz': 'dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d'},
75+
{'parking_lot-0.12.1.tar.gz': '3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f'},
76+
{'parking_lot_core-0.9.8.tar.gz': '93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447'},
77+
{'proc-macro2-1.0.66.tar.gz': '18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9'},
78+
{'pyo3-0.19.1.tar.gz': 'ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59'},
79+
{'pyo3-build-config-0.19.1.tar.gz': '554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0'},
80+
{'pyo3-ffi-0.19.1.tar.gz': '922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4'},
81+
{'pyo3-macros-0.19.1.tar.gz': '8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2'},
82+
{'pyo3-macros-backend-0.19.1.tar.gz': 'e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b'},
83+
{'quote-1.0.31.tar.gz': '5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0'},
84+
{'redox_syscall-0.3.5.tar.gz': '567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29'},
85+
{'rpds-0.13.0.tar.gz': '9bd6ce569b15c331b1e5fd8cf6adb0bf240678b5f0cdc4d0f41e11683f6feba9'},
86+
{'scopeguard-1.1.0.tar.gz': 'd29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd'},
87+
{'smallvec-1.11.0.tar.gz': '62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9'},
88+
{'static_assertions-1.1.0.tar.gz': 'a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f'},
89+
{'syn-1.0.109.tar.gz': '72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237'},
90+
{'target-lexicon-0.12.9.tar.gz': 'df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0'},
91+
{'unicode-ident-1.0.11.tar.gz': '301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c'},
92+
{'unindent-0.1.11.tar.gz': 'e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c'},
93+
{'windows-targets-0.48.1.tar.gz': '05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f'},
94+
{'windows_aarch64_gnullvm-0.48.0.tar.gz': '91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc'},
95+
{'windows_aarch64_msvc-0.48.0.tar.gz': 'b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3'},
96+
{'windows_i686_gnu-0.48.0.tar.gz': '622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241'},
97+
{'windows_i686_msvc-0.48.0.tar.gz': '4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00'},
98+
{'windows_x86_64_gnu-0.48.0.tar.gz': 'ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1'},
99+
{'windows_x86_64_gnullvm-0.48.0.tar.gz': '7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953'},
100+
{'windows_x86_64_msvc-0.48.0.tar.gz': '1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a'},
101+
]
102+
27103
# WARNING: the versions of ipywidgets, widgetsnbextension and jupyterlab_widgets are tied between them
28104
# use the versions published in a single release commit instead of blindly pushing to last available version,
29105
# see for instance https://github.com/jupyter-widgets/ipywidgets/commit/b728926f58ed3ffef08f716998ac6c226dafc1aa

easybuild/easyconfigs/m/maturin/maturin-1.1.0-GCCcore-12.3.0.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,11 @@ checksums = [
303303

304304
builddependencies = [
305305
('binutils', '2.40'),
306+
('Rust', '1.70.0'),
306307
('setuptools-rust', '1.6.0'),
307308
]
308309
dependencies = [
309310
('Python', '3.11.3'),
310-
('Rust', '1.70.0'),
311311
]
312312

313313
crates = [

easybuild/easyconfigs/n/nbclassic/nbclassic-1.0.0-GCCcore-12.3.0.eb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
1212

1313
builddependencies = [
1414
('binutils', '2.40'),
15-
('maturin', '1.1.0'),
1615
]
1716
dependencies = [
1817
('Python', '3.11.3'),

easybuild/easyconfigs/p/pymatgen/pymatgen-2023.12.18-foss-2023a.eb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
easyblock = 'PythonBundle'
1+
easyblock = 'CargoPythonBundle'
22

33
name = 'pymatgen'
44
version = '2023.12.18'
@@ -12,6 +12,7 @@ toolchain = {'name': 'foss', 'version': '2023a'}
1212
builddependencies = [
1313
('hatchling', '1.18.0'),
1414
('hypothesis', '6.82.0'), # required for tests
15+
('Rust', '1.70.0'),
1516
('maturin', '1.1.0'),
1617
('poetry', '1.5.1'),
1718
]
@@ -83,6 +84,10 @@ exts_list = [
8384
'd299f388044fdcff32fc246b0215ae4b656bc20d9d3c759d545cbe3167df08b8'},
8485
],
8586
}),
87+
# note: this version of orjson vendors the required Rust crates in the source tarball
88+
# under include/cargo (and instructs cargo to pick up on them via a custom .cargo/config.toml),
89+
# so no list of crates needs to be specified in this easyconfig to prevent downloading
90+
# crates by cargo during the installation
8691
('orjson', '3.9.10', {
8792
'checksums': ['9ebbdbd6a046c304b1845e96fbcc5559cd296b4dfd3ad2509e33c4d9ce07d6a1'],
8893
}),

0 commit comments

Comments
 (0)