Repository navigation
Commit d587748
authored
Move the pandas tests dependencies out of the all conda environments (NVIDIA#24960)
The pandas-tests extras added in NVIDIA#24835 include `pyqt`, which pulls in `qt-main` 5.15. Its `icu`/`libxml2<2.14`/`alsa-lib` requirements conflict with `openjdk>=22,<23` and `openmpi>=5.0` in the merged RAPIDS devcontainer conda env, so that environment cannot be solved on linux-aarch64 (rapidsai/devcontainers#805, `Build / all / arm64, 13.3, conda`).
These packages are only needed to run the pandas test suite, not in every cudf developer environment, so:
- Drop `test_python_pandas_tests` from the `all` file entry.
- Add a `pandas_tests` file entry with `output: none`. Its environment is generated on demand with `rapids-dependency-file-generator --file-key pandas_tests --output conda --matrix ""` and layered onto `all` with `conda env update`, so no extra files are committed. It carries no `python` or `cuda-version` pin, so it does not change the base environment's versions. I checked that the generated file plus `all_cuda-133_arch-aarch64` solves on linux-aarch64.
- Update the `update-pandas-testing` skill to create the environment that way.
CI is unaffected: the pandas-tests job installs the `pandas-tests` pip extra.
Failing CI log: https://github.com/rapidsai/devcontainers/actions/runs/40994236863/job/124205775940?pr=805#step:8:3322
Authors:
- Bradley Dice (https://github.com/bdice)
Approvers:
- James Lamb (https://github.com/jameslamb)
- Matthew Roeschke (https://github.com/mroeschke)
URL: NVIDIA#249601 parent 671e11b commit d587748
6 files changed
Lines changed: 9 additions & 91 deletions
File tree
- .agents/skills/update-pandas-testing
- conda/environments
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
39 | | - | |
40 | 37 | | |
41 | 38 | | |
42 | 39 | | |
43 | | - | |
44 | 40 | | |
45 | 41 | | |
46 | 42 | | |
47 | 43 | | |
48 | 44 | | |
49 | | - | |
50 | 45 | | |
51 | 46 | | |
52 | 47 | | |
| |||
57 | 52 | | |
58 | 53 | | |
59 | 54 | | |
60 | | - | |
61 | 55 | | |
62 | | - | |
63 | 56 | | |
64 | 57 | | |
65 | 58 | | |
| |||
70 | 63 | | |
71 | 64 | | |
72 | 65 | | |
73 | | - | |
74 | 66 | | |
75 | 67 | | |
76 | 68 | | |
77 | | - | |
78 | 69 | | |
79 | 70 | | |
80 | 71 | | |
81 | 72 | | |
82 | | - | |
83 | 73 | | |
84 | 74 | | |
85 | 75 | | |
86 | 76 | | |
87 | 77 | | |
88 | 78 | | |
89 | 79 | | |
90 | | - | |
91 | 80 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | 81 | | |
96 | 82 | | |
97 | 83 | | |
98 | 84 | | |
99 | | - | |
100 | 85 | | |
101 | 86 | | |
102 | 87 | | |
103 | | - | |
104 | 88 | | |
105 | 89 | | |
106 | 90 | | |
107 | 91 | | |
108 | | - | |
109 | | - | |
110 | 92 | | |
111 | 93 | | |
112 | 94 | | |
| |||
126 | 108 | | |
127 | 109 | | |
128 | 110 | | |
129 | | - | |
130 | 111 | | |
131 | 112 | | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | 113 | | |
136 | 114 | | |
137 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
39 | | - | |
40 | 37 | | |
41 | 38 | | |
42 | 39 | | |
43 | | - | |
44 | 40 | | |
45 | 41 | | |
46 | 42 | | |
47 | 43 | | |
48 | 44 | | |
49 | | - | |
50 | 45 | | |
51 | 46 | | |
52 | 47 | | |
| |||
57 | 52 | | |
58 | 53 | | |
59 | 54 | | |
60 | | - | |
61 | 55 | | |
62 | | - | |
63 | 56 | | |
64 | 57 | | |
65 | 58 | | |
| |||
71 | 64 | | |
72 | 65 | | |
73 | 66 | | |
74 | | - | |
75 | 67 | | |
76 | 68 | | |
77 | 69 | | |
78 | | - | |
79 | 70 | | |
80 | 71 | | |
81 | 72 | | |
82 | 73 | | |
83 | | - | |
84 | 74 | | |
85 | 75 | | |
86 | 76 | | |
87 | 77 | | |
88 | 78 | | |
89 | 79 | | |
90 | 80 | | |
91 | | - | |
92 | 81 | | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | 82 | | |
97 | 83 | | |
98 | 84 | | |
99 | 85 | | |
100 | | - | |
101 | 86 | | |
102 | 87 | | |
103 | 88 | | |
104 | | - | |
105 | 89 | | |
106 | 90 | | |
107 | 91 | | |
108 | 92 | | |
109 | | - | |
110 | | - | |
111 | 93 | | |
112 | 94 | | |
113 | 95 | | |
| |||
127 | 109 | | |
128 | 110 | | |
129 | 111 | | |
130 | | - | |
131 | 112 | | |
132 | 113 | | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | 114 | | |
137 | 115 | | |
138 | 116 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
39 | | - | |
40 | 37 | | |
41 | 38 | | |
42 | 39 | | |
43 | | - | |
44 | 40 | | |
45 | 41 | | |
46 | 42 | | |
47 | 43 | | |
48 | 44 | | |
49 | | - | |
50 | 45 | | |
51 | 46 | | |
52 | 47 | | |
| |||
57 | 52 | | |
58 | 53 | | |
59 | 54 | | |
60 | | - | |
61 | 55 | | |
62 | | - | |
63 | 56 | | |
64 | 57 | | |
65 | 58 | | |
| |||
70 | 63 | | |
71 | 64 | | |
72 | 65 | | |
73 | | - | |
74 | 66 | | |
75 | 67 | | |
76 | 68 | | |
77 | | - | |
78 | 69 | | |
79 | 70 | | |
80 | 71 | | |
81 | 72 | | |
82 | | - | |
83 | 73 | | |
84 | 74 | | |
85 | 75 | | |
86 | 76 | | |
87 | 77 | | |
88 | 78 | | |
89 | 79 | | |
90 | | - | |
91 | 80 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | 81 | | |
96 | 82 | | |
97 | 83 | | |
98 | 84 | | |
99 | | - | |
100 | 85 | | |
101 | 86 | | |
102 | 87 | | |
103 | | - | |
104 | 88 | | |
105 | 89 | | |
106 | 90 | | |
107 | 91 | | |
108 | | - | |
109 | | - | |
110 | 92 | | |
111 | 93 | | |
112 | 94 | | |
| |||
126 | 108 | | |
127 | 109 | | |
128 | 110 | | |
129 | | - | |
130 | 111 | | |
131 | 112 | | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | 113 | | |
136 | 114 | | |
137 | 115 | | |
| |||
0 commit comments