Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pip: fix example lockfiles, add paths.lockFile default #1017

Merged
merged 6 commits into from
Jul 13, 2024
Merged

pip: fix example lockfiles, add paths.lockFile default #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49a1961
pip: set sys-specific default for paths.lockFile
phaer Jul 13, 2024
2e5cf42
set paths.lockfile for pip example...
phaer Jul 13, 2024
f679e62
add x86_64-linux lock files
phaer Jul 13, 2024
0a7fefa
add darwin lock-files
phaer Jul 13, 2024
65bf5d4
adapt lock file path in pip tests
phaer Jul 13, 2024
80cfb95
eval examples on x86_64-linux & aarch64-darwin
phaer Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...al-development-machine-learning/lock.json → ...machine-learning/lock.aarch64-darwin.json
View file
Open in desktop
File renamed without changes.
275 changes: 275 additions & 0 deletions examples/packages/languages/python-local-development-machine-learning/lock.x86_64-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
{
"fetchPipMetadata": {
"sources": {
"filelock": {
"is_direct": false,
"sha256": "6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7",
"type": "url",
"url": "https://files.pythonhosted.org/packages/ae/f0/48285f0262fe47103a4a45972ed2f9b93e4c80b8fd609fa98da78b2a5706/filelock-3.15.4-py3-none-any.whl",
"version": "3.15.4"
},
"fsspec": {
"is_direct": false,
"sha256": "3cb443f8bcd2efb31295a5b9fdb02aee81d8452c80d28f97a6d0959e6cee101e",
"type": "url",
"url": "https://files.pythonhosted.org/packages/5e/44/73bea497ac69bafde2ee4269292fa3b41f1198f4bb7bbaaabde30ad29d4a/fsspec-2024.6.1-py3-none-any.whl",
"version": "2024.6.1"
},
"jinja2": {
"is_direct": false,
"sha256": "bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d",
"type": "url",
"url": "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl",
"version": "3.1.4"
},
"joblib": {
"is_direct": false,
"sha256": "06d478d5674cbc267e7496a410ee875abd68e4340feff4490bcb7afb88060ae6",
"type": "url",
"url": "https://files.pythonhosted.org/packages/91/29/df4b9b42f2be0b623cbd5e2140cafcaa2bef0759a00b7b70104dcfe2fb51/joblib-1.4.2-py3-none-any.whl",
"version": "1.4.2"
},
"markupsafe": {
"is_direct": false,
"sha256": "2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f",
"type": "url",
"url": "https://files.pythonhosted.org/packages/7c/52/2b1b570f6b8b803cef5ac28fdf78c0da318916c7d2fe9402a84d591b394c/MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "2.1.5"
},
"mpmath": {
"is_direct": false,
"sha256": "a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c",
"type": "url",
"url": "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl",
"version": "1.3.0"
},
"networkx": {
"is_direct": false,
"sha256": "28575580c6ebdaf4505b22c6256a2b9de86b316dc63ba9e93abde3d78dfdbcf2",
"type": "url",
"url": "https://files.pythonhosted.org/packages/38/e9/5f72929373e1a0e8d142a130f3f97e6ff920070f87f91c4e13e40e0fba5a/networkx-3.3-py3-none-any.whl",
"version": "3.3"
},
"numpy": {
"is_direct": false,
"sha256": "6d7696c615765091cc5093f76fd1fa069870304beaccfd58b5dcc69e55ef49c1",
"type": "url",
"url": "https://files.pythonhosted.org/packages/d6/a8/6a2419c40c7b6f7cb4ef52c532c88e55490c4fa92885964757d507adddce/numpy-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "2.0.0"
},
"nvidia-cublas-cu12": {
"is_direct": false,
"sha256": "ee53ccca76a6fc08fb9701aa95b6ceb242cdaab118c3bb152af4e579af792728",
"type": "url",
"url": "https://files.pythonhosted.org/packages/37/6d/121efd7382d5b0284239f4ab1fc1590d86d34ed4a4a2fdb13b30ca8e5740/nvidia_cublas_cu12-12.1.3.1-py3-none-manylinux1_x86_64.whl",
"version": "12.1.3.1"
},
"nvidia-cuda-cupti-cu12": {
"is_direct": false,
"sha256": "e54fde3983165c624cb79254ae9818a456eb6e87a7fd4d56a2352c24ee542d7e",
"type": "url",
"url": "https://files.pythonhosted.org/packages/7e/00/6b218edd739ecfc60524e585ba8e6b00554dd908de2c9c66c1af3e44e18d/nvidia_cuda_cupti_cu12-12.1.105-py3-none-manylinux1_x86_64.whl",
"version": "12.1.105"
},
"nvidia-cuda-nvrtc-cu12": {
"is_direct": false,
"sha256": "339b385f50c309763ca65456ec75e17bbefcbbf2893f462cb8b90584cd27a1c2",
"type": "url",
"url": "https://files.pythonhosted.org/packages/b6/9f/c64c03f49d6fbc56196664d05dba14e3a561038a81a638eeb47f4d4cfd48/nvidia_cuda_nvrtc_cu12-12.1.105-py3-none-manylinux1_x86_64.whl",
"version": "12.1.105"
},
"nvidia-cuda-runtime-cu12": {
"is_direct": false,
"sha256": "6e258468ddf5796e25f1dc591a31029fa317d97a0a94ed93468fc86301d61e40",
"type": "url",
"url": "https://files.pythonhosted.org/packages/eb/d5/c68b1d2cdfcc59e72e8a5949a37ddb22ae6cade80cd4a57a84d4c8b55472/nvidia_cuda_runtime_cu12-12.1.105-py3-none-manylinux1_x86_64.whl",
"version": "12.1.105"
},
"nvidia-cudnn-cu12": {
"is_direct": false,
"sha256": "5ccb288774fdfb07a7e7025ffec286971c06d8d7b4fb162525334616d7629ff9",
"type": "url",
"url": "https://files.pythonhosted.org/packages/ff/74/a2e2be7fb83aaedec84f391f082cf765dfb635e7caa9b49065f73e4835d8/nvidia_cudnn_cu12-8.9.2.26-py3-none-manylinux1_x86_64.whl",
"version": "8.9.2.26"
},
"nvidia-cufft-cu12": {
"is_direct": false,
"sha256": "794e3948a1aa71fd817c3775866943936774d1c14e7628c74f6f7417224cdf56",
"type": "url",
"url": "https://files.pythonhosted.org/packages/86/94/eb540db023ce1d162e7bea9f8f5aa781d57c65aed513c33ee9a5123ead4d/nvidia_cufft_cu12-11.0.2.54-py3-none-manylinux1_x86_64.whl",
"version": "11.0.2.54"
},
"nvidia-curand-cu12": {
"is_direct": false,
"sha256": "9d264c5036dde4e64f1de8c50ae753237c12e0b1348738169cd0f8a536c0e1e0",
"type": "url",
"url": "https://files.pythonhosted.org/packages/44/31/4890b1c9abc496303412947fc7dcea3d14861720642b49e8ceed89636705/nvidia_curand_cu12-10.3.2.106-py3-none-manylinux1_x86_64.whl",
"version": "10.3.2.106"
},
"nvidia-cusolver-cu12": {
"is_direct": false,
"sha256": "8a7ec542f0412294b15072fa7dab71d31334014a69f953004ea7a118206fe0dd",
"type": "url",
"url": "https://files.pythonhosted.org/packages/bc/1d/8de1e5c67099015c834315e333911273a8c6aaba78923dd1d1e25fc5f217/nvidia_cusolver_cu12-11.4.5.107-py3-none-manylinux1_x86_64.whl",
"version": "11.4.5.107"
},
"nvidia-cusparse-cu12": {
"is_direct": false,
"sha256": "f3b50f42cf363f86ab21f720998517a659a48131e8d538dc02f8768237bd884c",
"type": "url",
"url": "https://files.pythonhosted.org/packages/65/5b/cfaeebf25cd9fdec14338ccb16f6b2c4c7fa9163aefcf057d86b9cc248bb/nvidia_cusparse_cu12-12.1.0.106-py3-none-manylinux1_x86_64.whl",
"version": "12.1.0.106"
},
"nvidia-nccl-cu12": {
"is_direct": false,
"sha256": "057f6bf9685f75215d0c53bf3ac4a10b3e6578351de307abad9e18a99182af56",
"type": "url",
"url": "https://files.pythonhosted.org/packages/4b/2a/0a131f572aa09f741c30ccd45a8e56316e8be8dfc7bc19bf0ab7cfef7b19/nvidia_nccl_cu12-2.20.5-py3-none-manylinux2014_x86_64.whl",
"version": "2.20.5"
},
"nvidia-nvjitlink-cu12": {
"is_direct": false,
"sha256": "f9b37bc5c8cf7509665cb6ada5aaa0ce65618f2332b7d3e78e9790511f111212",
"type": "url",
"url": "https://files.pythonhosted.org/packages/75/bc/e0d0dbb85246a086ab14839979039647bce501d8c661a159b8b019d987b7/nvidia_nvjitlink_cu12-12.5.82-py3-none-manylinux2014_x86_64.whl",
"version": "12.5.82"
},
"nvidia-nvtx-cu12": {
"is_direct": false,
"sha256": "dc21cf308ca5691e7c04d962e213f8a4aa9bbfa23d95412f452254c2caeb09e5",
"type": "url",
"url": "https://files.pythonhosted.org/packages/da/d3/8057f0587683ed2fcd4dbfbdfdfa807b9160b809976099d36b8f60d08f03/nvidia_nvtx_cu12-12.1.105-py3-none-manylinux1_x86_64.whl",
"version": "12.1.105"
},
"pillow": {
"is_direct": false,
"sha256": "a985e028fc183bf12a77a8bbf36318db4238a3ded7fa9df1b9a133f1cb79f8fc",
"type": "url",
"url": "https://files.pythonhosted.org/packages/b5/5b/6651c288b08df3b8c1e2f8c1152201e0b25d240e22ddade0f1e242fc9fa0/pillow-10.4.0-cp310-cp310-manylinux_2_28_x86_64.whl",
"version": "10.4.0"
},
"scikit-learn": {
"is_direct": false,
"sha256": "161808750c267b77b4a9603cf9c93579c7a74ba8486b1336034c2f1579546d21",
"type": "url",
"url": "https://files.pythonhosted.org/packages/f2/60/6c589c91e474721efdcec82ea9cc5c743359e52637e46c364ee5236666ef/scikit_learn-1.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "1.5.1"
},
"scipy": {
"is_direct": false,
"sha256": "42470ea0195336df319741e230626b6225a740fd9dce9642ca13e98f667047c0",
"type": "url",
"url": "https://files.pythonhosted.org/packages/e2/20/15c8fe0dfebb6facd81b3d08bf45dfa080e305deb17172b0a40eba59e927/scipy-1.14.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "1.14.0"
},
"sympy": {
"is_direct": false,
"sha256": "6b0b32a4673fb91bd3cac3b55406c8e01d53ae22780be467301cc452f6680c92",
"type": "url",
"url": "https://files.pythonhosted.org/packages/62/74/7e6c65ee89ff43942bffffdbb238634f16967bf327aee3c76efcf6e49587/sympy-1.13.0-py3-none-any.whl",
"version": "1.13.0"
},
"threadpoolctl": {
"is_direct": false,
"sha256": "56c1e26c150397e58c4926da8eeee87533b1e32bef131bd4bf6a2f45f3185467",
"type": "url",
"url": "https://files.pythonhosted.org/packages/4b/2c/ffbf7a134b9ab11a67b0cf0726453cedd9c5043a4fe7a35d1cefa9a1bcfb/threadpoolctl-3.5.0-py3-none-any.whl",
"version": "3.5.0"
},
"torch": {
"is_direct": false,
"sha256": "605a25b23944be5ab7c3467e843580e1d888b8066e5aaf17ff7bf9cc30001cc3",
"type": "url",
"url": "https://files.pythonhosted.org/packages/cb/e2/1bd899d3eb60c6495cf5d0d2885edacac08bde7a1407eadeb2ab36eca3c7/torch-2.3.1-cp310-cp310-manylinux1_x86_64.whl",
"version": "2.3.1"
},
"triton": {
"is_direct": false,
"sha256": "3c84595cbe5e546b1b290d2a58b1494df5a2ef066dd890655e5b8a8a92205c33",
"type": "url",
"url": "https://files.pythonhosted.org/packages/d7/69/8a9fde07d2d27a90e16488cdfe9878e985a247b2496a4b5b1a2126042528/triton-2.3.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "2.3.1"
},
"typing-extensions": {
"is_direct": false,
"sha256": "04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
"type": "url",
"url": "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl",
"version": "4.12.2"
}
},
"targets": {
"default": {
"filelock": [],
"fsspec": [],
"jinja2": [
"markupsafe"
],
"joblib": [],
"markupsafe": [],
"mpmath": [],
"networkx": [],
"numpy": [],
"nvidia-cublas-cu12": [],
"nvidia-cuda-cupti-cu12": [],
"nvidia-cuda-nvrtc-cu12": [],
"nvidia-cuda-runtime-cu12": [],
"nvidia-cudnn-cu12": [
"nvidia-cublas-cu12"
],
"nvidia-cufft-cu12": [],
"nvidia-curand-cu12": [],
"nvidia-cusolver-cu12": [
"nvidia-cublas-cu12",
"nvidia-cusparse-cu12",
"nvidia-nvjitlink-cu12"
],
"nvidia-cusparse-cu12": [
"nvidia-nvjitlink-cu12"
],
"nvidia-nccl-cu12": [],
"nvidia-nvjitlink-cu12": [],
"nvidia-nvtx-cu12": [],
"pillow": [],
"scikit-learn": [
"joblib",
"numpy",
"scipy",
"threadpoolctl"
],
"scipy": [
"numpy"
],
"sympy": [
"mpmath"
],
"threadpoolctl": [],
"torch": [
"filelock",
"fsspec",
"jinja2",
"networkx",
"nvidia-cublas-cu12",
"nvidia-cuda-cupti-cu12",
"nvidia-cuda-nvrtc-cu12",
"nvidia-cuda-runtime-cu12",
"nvidia-cudnn-cu12",
"nvidia-cufft-cu12",
"nvidia-curand-cu12",
"nvidia-cusolver-cu12",
"nvidia-cusparse-cu12",
"nvidia-nccl-cu12",
"nvidia-nvtx-cu12",
"sympy",
"triton",
"typing-extensions"
],
"triton": [
"filelock"
],
"typing-extensions": []
}
}
},
"invalidationHash": "70927cbb56478f8e952deb1a0a08687c2f8016bffb1e0330c8f9a452a9cbbb2b"
}
1 change: 1 addition & 0 deletions examples/packages/languages/python-local-development-multiple-packages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ in {
"subpkg2"
];

paths.lockFile = "lock.${config.deps.stdenv.system}.json";
pip = {
requirementsList = [
"${config.paths.package}/subpkg1"
Expand Down
0 ...l-development-multiple-packages/lock.json → ...ultiple-packages/lock.aarch64-darwin.json
View file
Open in desktop
File renamed without changes.
27 changes: 27 additions & 0 deletions ...ples/packages/languages/python-local-development-multiple-packages/lock.x86_64-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"fetchPipMetadata": {
"sources": {
"subpkg1": {
"is_direct": true,
"path": "subpkg1",
"type": "local",
"version": "0.0.1"
},
"subpkg2": {
"is_direct": true,
"path": "subpkg2",
"type": "local",
"version": "0.0.2"
}
},
"targets": {
"default": {
"subpkg1": [
"subpkg2"
],
"subpkg2": []
}
}
},
"invalidationHash": "1c3ea22f49efe9faefcac00ba72b8bf9f2d9f657dd6c091252f11624a671e25b"
}
1 change: 1 addition & 0 deletions examples/packages/languages/python-local-development/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ in {
];
};

paths.lockFile = "lock.${config.deps.stdenv.system}.json";
pip = {
# Setting editables.$pkg.null will link the current project root as an editable
# for the root package (my-tool here), or otherwise copy the contents of mkDerivation.src
Expand Down
0 ...guages/python-local-development/lock.json → ...ocal-development/lock.aarch64-darwin.json
View file
Open in desktop
File renamed without changes.
73 changes: 73 additions & 0 deletions examples/packages/languages/python-local-development/lock.x86_64-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"fetchPipMetadata": {
"sources": {
"certifi": {
"is_direct": false,
"sha256": "c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90",
"type": "url",
"url": "https://files.pythonhosted.org/packages/1c/d5/c84e1a17bf61d4df64ca866a1c9a913874b4e9bdc131ec689a0ad013fb36/certifi-2024.7.4-py3-none-any.whl",
"version": "2024.7.4"
},
"charset-normalizer": {
"is_direct": false,
"sha256": "753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
"type": "url",
"url": "https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
"version": "3.3.2"
},
"click": {
"is_direct": true,
"rev": "14f735cf59618941cf2930e633eb77651b1dc7cb",
"sha256": "1mriyhx9gcms5bsbdlg8akjpsj3v7p0g38spabx2vm6g9h1yg4zc",
"type": "git",
"url": "https://github.com/pallets/click.git",
"version": "8.2.0.dev0"
},
"idna": {
"is_direct": false,
"sha256": "82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0",
"type": "url",
"url": "https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl",
"version": "3.7"
},
"requests": {
"is_direct": false,
"sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6",
"type": "url",
"url": "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl",
"version": "2.32.3"
},
"setuptools": {
"is_direct": false,
"sha256": "fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc",
"type": "url",
"url": "https://files.pythonhosted.org/packages/ef/15/88e46eb9387e905704b69849618e699dc2f54407d8953cc4ec4b8b46528d/setuptools-70.3.0-py3-none-any.whl",
"version": "70.3.0"
},
"urllib3": {
"is_direct": false,
"sha256": "a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
"type": "url",
"url": "https://files.pythonhosted.org/packages/ca/1c/89ffc63a9605b583d5df2be791a27bc1a42b7c32bab68d3c8f2f73a98cd4/urllib3-2.2.2-py3-none-any.whl",
"version": "2.2.2"
}
},
"targets": {
"default": {
"certifi": [],
"charset-normalizer": [],
"click": [],
"idna": [],
"requests": [
"certifi",
"charset-normalizer",
"idna",
"urllib3"
],
"setuptools": [],
"urllib3": []
}
}
},
"invalidationHash": "0b9e5e3dccfe479110aacf335f3d8f939c6fd18f6fbc03b850e196178b6897c3"
}
Loading