conda-forge / conda-smithy / 15637397827

71%

master: 60%

push

github

Fix incorrect merge for non-None ordering (#2335)

* correctly merge all versions in variant_key_add when ordering present

* remove debug prints in test_variant_algebra.py

* add test for correctly applying ordering to tail elements

* reinstate element-by-element computation for non-ordering case

due to needing to merge left/right sides with multiple repeated values, e.g.
```
v_left=['cpython'], v_right=['cpython', 'cpython', 'cpython', 'pypy']
```
we cannot apply the ordering-logic to this case.

* add a safety net for ambiguous case

* abominable black formatting

* add news

* add test for combination of CUDA 11.8 & 12.9 migrators

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Matthew R. Becker <beckermr@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

1337 of 2004 branches covered (66.72%)

18 of 21 new or added lines in 1 file covered. (85.71%)

3525 of 4859 relevant lines covered (72.55%)

0.73 hits per line