|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
diff -up conda-4.8.4/tests/core/test_solve.py.32bit conda-4.8.4/tests/core/test_solve.py
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
--- conda-4.8.4/tests/core/test_solve.py.32bit 2020-08-06 15:02:52.000000000 -0600
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
+++ conda-4.8.4/tests/core/test_solve.py 2020-08-07 19:12:28.240154100 -0600
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
@@ -284,14 +284,14 @@ def test_cuda_fail_1(tmpdir):
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
if sys.platform == "darwin":
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
plat = "osx-64"
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
elif sys.platform == "linux":
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
- plat = "linux-64"
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
+ plat = "linux-%s" % platform.architecture()[0][0:2]
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
elif sys.platform == "win32":
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
if platform.architecture()[0] == "32bit":
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
plat = "win-32"
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
else:
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
plat = "win-64"
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
else:
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
- plat = "linux-64"
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
+ plat = "linux-%s" % platform.architecture()[0][0:2]
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
8d36745 |
assert str(exc.value).strip() == dals("""The following specifications were found to be incompatible with your system:
|
|
![](https://seccdn.libravatar.org/avatar/0b2750e4294f64ba21799a0c943b16696b8a8d6bb1286fd347db9107652eaf6f?s=16&d=retro) |
f8c51ee |
|