Skip to content

Commit

Permalink
fix: adapt channels to work with newest rattler-build version (#2306)
Browse files Browse the repository at this point in the history
- stop letting recipe and output share same dir
- move from nu to python
- add pixi task
- update all channels in one go
  • Loading branch information
Hofer-Julian authored Oct 18, 2024
1 parent 40dff8d commit 7e2bcd2
Show file tree
Hide file tree
Showing 134 changed files with 292 additions and 223 deletions.
1 change: 1 addition & 0 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ test-integration-global = { cmd = "pytest --numprocesses=auto --durations=10 tes
# /path/to/test.py::test_function
test-specific-test = { cmd = "pytest", depends-on = ["build"] }
typecheck-integration = "mypy --strict tests/integration"
update-integration-test-data = { cmd = "python update-channels.py", cwd = "tests/integration/test_data" }

[feature.dev.dependencies]
# Needed for the citation
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ def test_data() -> Path:

@pytest.fixture
def dummy_channel_1(test_data: Path) -> str:
return test_data.joinpath("dummy_channel_1/output").as_uri()
return test_data.joinpath("channels", "dummy_channel_1").as_uri()


@pytest.fixture
def dummy_channel_2(test_data: Path) -> str:
return test_data.joinpath("dummy_channel_2/output").as_uri()
return test_data.joinpath("channels", "dummy_channel_2").as_uri()


@pytest.fixture
def global_update_channel_1(test_data: Path) -> str:
return test_data.joinpath("global_update_channel_1/output").as_uri()
return test_data.joinpath("channels", "global_update_channel_1").as_uri()


@pytest.fixture
def non_self_expose_channel(test_data: Path) -> str:
return test_data.joinpath("non_self_expose_channel/output").as_uri()
return test_data.joinpath("channels", "non_self_expose_channel").as_uri()
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
"depends": [
"dummy-c"
],
"md5": "597e9cb900b6959ac30f8e2deb387be5",
"md5": "656a6e0333247de527797d3280aa72ca",
"name": "dummy-a",
"platform": "linux",
"sha256": "14a455ab09bc5f0aa45add672e03903b3506ec9cec1f3ed56d211e4c500a2c82",
"size": 196722,
"sha256": "320d68fb5819a01186d5f2673d155efc2fe70351897530aa19f82534572d836c",
"size": 2504,
"subdir": "linux-64",
"timestamp": 1728656618060,
"timestamp": 1729178223687,
"version": "0.1.0"
},
"dummy-b-0.1.0-hb0f4dca_0.conda": {
"arch": "x86_64",
"build": "hb0f4dca_0",
"build_number": 0,
"depends": [],
"md5": "49bd2f4567a0ba51b4eb8792ed0c851b",
"md5": "becfc57e88e21f5626737cb92fece721",
"name": "dummy-b",
"platform": "linux",
"sha256": "61dae106b7f44a74bcf89064ec25e3e76097deabfe8c2d4ea12d2c09abc6daef",
"size": 149020,
"sha256": "f80008aee11ff8bfc1504a8a9c331703a9d12e78d91b9299a7a0a2de1ade9f30",
"size": 2403,
"subdir": "linux-64",
"timestamp": 1728656618060,
"timestamp": 1729178223687,
"version": "0.1.0"
},
"dummy-c-0.1.0-hb0f4dca_0.conda": {
"arch": "x86_64",
"build": "hb0f4dca_0",
"build_number": 0,
"depends": [],
"md5": "b33c6761380ff086c99f96ed36fdcfe1",
"md5": "752d10423b31d4fbf9ff7d0b2cc3ab8c",
"name": "dummy-c",
"platform": "linux",
"sha256": "0e6861e1b51d0b2471f1be0fc5b6e65cf3cf4cc2f7d4cf6a20400bae85b7b563",
"size": 159429,
"sha256": "543020b97859f95a8f8d950f874c65c7f9df1bb5bd9b045152240c2ecf5857f6",
"size": 2409,
"subdir": "linux-64",
"timestamp": 1728656618060,
"timestamp": 1729178223687,
"version": "0.1.0"
},
"dummy-d-0.1.0-hb0f4dca_0.conda": {
Expand All @@ -55,27 +55,27 @@
"depends": [
"dummy-x"
],
"md5": "bf9a8314ff17815586f8a0277f2b0de8",
"md5": "f3010480159c90ad9ced02778d4b6653",
"name": "dummy-d",
"platform": "linux",
"sha256": "fff1786527dabae7ec1da256547b02046694411fd13b21af841df18743e53644",
"size": 171447,
"sha256": "09dae30e71599738a33e6a1c08435cf28afbe7cfdd0ae5fadaf0de199b565476",
"size": 2395,
"subdir": "linux-64",
"timestamp": 1728656618060,
"timestamp": 1729178223687,
"version": "0.1.0"
},
"dummy_e-0.1.0-hb0f4dca_0.conda": {
"arch": "x86_64",
"build": "hb0f4dca_0",
"build_number": 0,
"depends": [],
"md5": "92d19184d86598cd12ca01c7540d2985",
"md5": "8bc477124715f4a5bc48b457a61d1c77",
"name": "dummy_e",
"platform": "linux",
"sha256": "a94c94f04912d5ca926d560c634857bacea847046ab80b5cd674f2624722807e",
"size": 183759,
"sha256": "9c9c5a5b66caae82708c53ea5428d467f46b76b862c9c63d4e649a1eee6c164e",
"size": 2401,
"subdir": "linux-64",
"timestamp": 1728656618060,
"timestamp": 1729178223687,
"version": "0.1.0"
}
},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
"depends": [
"dummy-c"
],
"md5": "08fbe58a444f0ece0089d419c7afd2b1",
"md5": "36f7dd667fda07b528008100cb07c91d",
"name": "dummy-a",
"platform": "osx",
"sha256": "c4840441825cf855f003d57facbaba274bcdf28743424c7a7b548ae974d737b0",
"size": 315563,
"sha256": "8554ebfabc3186bb9e3ab542f25371eadfe9dd03ce157787ccf04c65ce86785a",
"size": 2510,
"subdir": "osx-64",
"timestamp": 1728656619048,
"timestamp": 1729178223878,
"version": "0.1.0"
},
"dummy-b-0.1.0-h0dc7051_0.conda": {
"arch": "x86_64",
"build": "h0dc7051_0",
"build_number": 0,
"depends": [],
"md5": "5758178d2d15b3c4758e1c6286c1e714",
"md5": "168efaabed245a7f6234c29da9ff7dff",
"name": "dummy-b",
"platform": "osx",
"sha256": "704f2af4e85ef4858e60e42ffe117ed4208f14c72f62f8192e4cbe3801943dc0",
"size": 334599,
"sha256": "273195138ff2808c2174a1bf3b51bc7a382e7bad36b8bd20948d3f05c9777e15",
"size": 2403,
"subdir": "osx-64",
"timestamp": 1728656619048,
"timestamp": 1729178223877,
"version": "0.1.0"
},
"dummy-c-0.1.0-h0dc7051_0.conda": {
"arch": "x86_64",
"build": "h0dc7051_0",
"build_number": 0,
"depends": [],
"md5": "56cda8fe1b6f9979759094bd08b8c982",
"md5": "a0a4e037e427a5290a5ef95f98627a90",
"name": "dummy-c",
"platform": "osx",
"sha256": "e7afcdb7bc8a7bdd0724047acd5c32d3ecd5cea08b1e275222efa727d263a73c",
"size": 298829,
"sha256": "b1dd6e15d755eba1386e71cd5d15fff983ecdc80785125553eeff54b12f0950f",
"size": 2392,
"subdir": "osx-64",
"timestamp": 1728656619048,
"timestamp": 1729178223877,
"version": "0.1.0"
},
"dummy-d-0.1.0-h0dc7051_0.conda": {
Expand All @@ -55,27 +55,27 @@
"depends": [
"dummy-x"
],
"md5": "2a15c9a07af764199be9f2c46f2bb82a",
"md5": "9293715b35c6cfd25e169d7a812bc6a9",
"name": "dummy-d",
"platform": "osx",
"sha256": "2e2862a7b20d1e536f33be1f9bc6dfef13eab94363b2d73e355254a841fd1520",
"size": 283050,
"sha256": "db553e110f9ca753bba98fa775ea1726c7c921a35818f905c155c1df64a995e4",
"size": 2419,
"subdir": "osx-64",
"timestamp": 1728656619048,
"timestamp": 1729178223877,
"version": "0.1.0"
},
"dummy_e-0.1.0-h0dc7051_0.conda": {
"arch": "x86_64",
"build": "h0dc7051_0",
"build_number": 0,
"depends": [],
"md5": "587cbef047629540ef0c618981ca6000",
"md5": "c82802223713db19e5317a4901e2c9c5",
"name": "dummy_e",
"platform": "osx",
"sha256": "637622288678a6adcf6ab71909acd80a356be4f94675f823745968d9755f97ee",
"size": 267020,
"sha256": "a5ac9a270ed315822fe1cbec8e2480d0e1a33f68d8b45b567919f512e03b467a",
"size": 2389,
"subdir": "osx-64",
"timestamp": 1728656619048,
"timestamp": 1729178223877,
"version": "0.1.0"
}
},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
"depends": [
"dummy-c"
],
"md5": "207186e8a7cf582b9a0dcbbd3b940a24",
"md5": "b80edffcb7728032a13c03c1b7818e14",
"name": "dummy-a",
"platform": "osx",
"sha256": "88639105a6495d3dfeb316b1ed5b39c7a5444e49f68dd6f6e6e462170f8bf56e",
"size": 233247,
"sha256": "7559a2bac20fb206e813b68453efb81170f46eae2bda82f0a7bd95775b2106bb",
"size": 2500,
"subdir": "osx-arm64",
"timestamp": 1728656618428,
"timestamp": 1729178223781,
"version": "0.1.0"
},
"dummy-b-0.1.0-h60d57d3_0.conda": {
"arch": "arm64",
"build": "h60d57d3_0",
"build_number": 0,
"depends": [],
"md5": "7a51cdd64a06c00ad6dd9c7e5a215ccc",
"md5": "bdf994866192d80bd4e6573bb40352c3",
"name": "dummy-b",
"platform": "osx",
"sha256": "62e38dd89eee4c0fd88ba268b1d70de40b4ac99c01e430c7345f7b2f527986a0",
"size": 258331,
"sha256": "0b268b7396a8221ab7947fc88436a4abbb7530fb6a65f889678f7ddf6a34e177",
"size": 2408,
"subdir": "osx-arm64",
"timestamp": 1728656618429,
"timestamp": 1729178223781,
"version": "0.1.0"
},
"dummy-c-0.1.0-h60d57d3_0.conda": {
"arch": "arm64",
"build": "h60d57d3_0",
"build_number": 0,
"depends": [],
"md5": "7d1c920bd362ce87fb60ec7dc022c70a",
"md5": "ba4e3779a273e62ead6dc2d22de32906",
"name": "dummy-c",
"platform": "osx",
"sha256": "e4fc8d68868c6a7811aa05ace230bb6ff35f32f2c84e8e800050603e470fd59d",
"size": 224415,
"sha256": "8b8126a175904c86cd34139658e6c5c052d078fa6d4fe78367fb261936673c4f",
"size": 2388,
"subdir": "osx-arm64",
"timestamp": 1728656618429,
"timestamp": 1729178223781,
"version": "0.1.0"
},
"dummy-d-0.1.0-h60d57d3_0.conda": {
Expand All @@ -55,27 +55,27 @@
"depends": [
"dummy-x"
],
"md5": "0c511e248e8d9d9e1eee68ceb0a0b7ee",
"md5": "d1b1d17bee12674c7534f320c479b318",
"name": "dummy-d",
"platform": "osx",
"sha256": "31483bb2eefdb2c37c549b36200b847ff2db3ca0ed70ae027577fc3a2cd16f5b",
"size": 210149,
"sha256": "5cf5660f664e1ff3bb096cc16446a55577055ec29cd8cfd43884512de9e12aeb",
"size": 2432,
"subdir": "osx-arm64",
"timestamp": 1728656618428,
"timestamp": 1729178223781,
"version": "0.1.0"
},
"dummy_e-0.1.0-h60d57d3_0.conda": {
"arch": "arm64",
"build": "h60d57d3_0",
"build_number": 0,
"depends": [],
"md5": "f294953bfdad44eace2f6c7afd62767b",
"md5": "88ff766b28e400c2e430194e2952be5d",
"name": "dummy_e",
"platform": "osx",
"sha256": "f4649e11ddcd0a5fea4256c69fb02e047d1efdbd8de03d88b3c850b9824f0993",
"size": 246049,
"sha256": "bbd7ca46d398107af5ecc5a7fd59085e9fa4572806c772e64cb05bfbf586b02f",
"size": 2411,
"subdir": "osx-arm64",
"timestamp": 1728656618429,
"timestamp": 1729178223781,
"version": "0.1.0"
}
},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
"depends": [
"dummy-c"
],
"md5": "f0d02cc7bad16e7c5c549118fcfaac3b",
"md5": "894862bd4f896ed5f204f1be13b2b056",
"name": "dummy-a",
"platform": "win",
"sha256": "6103329bc03095464bfb421b02bccd36c7cd2e70ec5a8f45c6acae22a4627b72",
"size": 129862,
"sha256": "f15a3ad0632b9b7359ace8d7e7ef048de82e4e585e2da1c4bd8457d329339b85",
"size": 2515,
"subdir": "win-64",
"timestamp": 1728656617798,
"timestamp": 1729178223602,
"version": "0.1.0"
},
"dummy-b-0.1.0-h9490d1a_0.conda": {
"arch": "x86_64",
"build": "h9490d1a_0",
"build_number": 0,
"depends": [],
"md5": "f2cdc4fe37dcdc53bc756182400c07ef",
"md5": "40e2b96280f62e5391008ae4d7d167ff",
"name": "dummy-b",
"platform": "win",
"sha256": "301cc1f47767d76e440dd9d33c8b7f04aefbcc283944f6e50d7e9fecb43993d2",
"size": 119245,
"sha256": "bebdbd62ba324e2ce75f32903e2dcd7bcdd5d3da2bf57e271915b4a30cf4522f",
"size": 2396,
"subdir": "win-64",
"timestamp": 1728656617798,
"timestamp": 1729178223602,
"version": "0.1.0"
},
"dummy-c-0.1.0-h9490d1a_0.conda": {
"arch": "x86_64",
"build": "h9490d1a_0",
"build_number": 0,
"depends": [],
"md5": "7eb77094d24bce94fbde43196fca26bf",
"md5": "603eb9a71b601c278d746291d5e1ef73",
"name": "dummy-c",
"platform": "win",
"sha256": "76e49accd774dc4785b377356f5267d8539fff68d1d9fe27b702b140d18ddf69",
"size": 111514,
"sha256": "2f33d8861b04322e0678070cd6a40e088e8d96de7f63d4a5f1393deeb070e5de",
"size": 2392,
"subdir": "win-64",
"timestamp": 1728656617798,
"timestamp": 1729178223601,
"version": "0.1.0"
},
"dummy-d-0.1.0-h9490d1a_0.conda": {
Expand All @@ -55,27 +55,27 @@
"depends": [
"dummy-x"
],
"md5": "6cb27a4201ffc597ccafdcc2b80133c7",
"md5": "b148a579bf9c311788e4426da2d39f52",
"name": "dummy-d",
"platform": "win",
"sha256": "dbe72e74ada93d5edfed84bf369a564d17b0949f188dc8ec1f5f81e418d20e95",
"size": 140004,
"sha256": "39e3639f3b687441f0279bc969a3926bbd45ae9c60d64f2bc2c8039e735ab337",
"size": 2425,
"subdir": "win-64",
"timestamp": 1728656617798,
"timestamp": 1729178223602,
"version": "0.1.0"
},
"dummy_e-0.1.0-h9490d1a_0.conda": {
"arch": "x86_64",
"build": "h9490d1a_0",
"build_number": 0,
"depends": [],
"md5": "42a198b645aaa487b2eec2ce5da0417d",
"md5": "ece6c43744065efeacc62233a3ba17a1",
"name": "dummy_e",
"platform": "win",
"sha256": "862286175f4634fc02fd647dbc4438aca5f004c3913b06173efa21608e5fbc9a",
"size": 101456,
"sha256": "7873f5aabe91760125c276695c040f570435218d88f7ac62a7cbe9649c7bf94b",
"size": 2416,
"subdir": "win-64",
"timestamp": 1728656617798,
"timestamp": 1729178223602,
"version": "0.1.0"
}
},
Expand Down
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 7e2bcd2

Please sign in to comment.