Support overriding python_interpreter_target

examples/pdm/WORKSPACE

@@ -29,7 +29,7 @@ local_repository(
 
 load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
-rules_pycross_dependencies()
+rules_pycross_dependencies(python_interpreter_target = interpreter)
 
 load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
 

examples/poetry/WORKSPACE

@@ -29,7 +29,7 @@ local_repository(
 
 load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
-rules_pycross_dependencies()
+rules_pycross_dependencies(python_interpreter_target = interpreter)
 
 load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
 

internal_deps.bzl

@@ -12,9 +12,9 @@ def rules_pycross_internal_deps():
     maybe(
         http_archive,
         name = "rules_python",
-        sha256 = "56dc7569e5dd149e576941bdb67a57e19cd2a7a63cc352b62ac047732008d7e1",
-        strip_prefix = "rules_python-0.10.0",
-        url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.10.0.tar.gz",
+        sha256 = "8c8fe44ef0a9afc256d1e75ad5f448bb59b81aba149b8958f02f7b3a98f5d9b4",
+        strip_prefix = "rules_python-0.13.0",
+        url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz",
     )
 
     maybe(

pycross/private/pypi_requirements.bzl

@@ -11,7 +11,7 @@ all_requirements = ["@rules_pycross_pypi_deps_blinker//:pkg", "@rules_pycross_py
 all_whl_requirements = ["@rules_pycross_pypi_deps_blinker//:whl", "@rules_pycross_pypi_deps_build//:whl", "@rules_pycross_pypi_deps_cachecontrol//:whl", "@rules_pycross_pypi_deps_certifi//:whl", "@rules_pycross_pypi_deps_charset_normalizer//:whl", "@rules_pycross_pypi_deps_commonmark//:whl", "@rules_pycross_pypi_deps_dacite//:whl", "@rules_pycross_pypi_deps_distlib//:whl", "@rules_pycross_pypi_deps_filelock//:whl", "@rules_pycross_pypi_deps_findpython//:whl", "@rules_pycross_pypi_deps_idna//:whl", "@rules_pycross_pypi_deps_installer//:whl", "@rules_pycross_pypi_deps_lockfile//:whl", "@rules_pycross_pypi_deps_msgpack//:whl", "@rules_pycross_pypi_deps_packaging//:whl", "@rules_pycross_pypi_deps_pdm//:whl", "@rules_pycross_pypi_deps_pdm_pep517//:whl", "@rules_pycross_pypi_deps_pep517//:whl", "@rules_pycross_pypi_deps_platformdirs//:whl", "@rules_pycross_pypi_deps_poetry_core//:whl", "@rules_pycross_pypi_deps_pygments//:whl", "@rules_pycross_pypi_deps_pyparsing//:whl", "@rules_pycross_pypi_deps_python_dotenv//:whl", "@rules_pycross_pypi_deps_requests//:whl", "@rules_pycross_pypi_deps_requests_toolbelt//:whl", "@rules_pycross_pypi_deps_resolvelib//:whl", "@rules_pycross_pypi_deps_rich//:whl", "@rules_pycross_pypi_deps_shellingham//:whl", "@rules_pycross_pypi_deps_six//:whl", "@rules_pycross_pypi_deps_tomli//:whl", "@rules_pycross_pypi_deps_tomlkit//:whl", "@rules_pycross_pypi_deps_typing_extensions//:whl", "@rules_pycross_pypi_deps_unearth//:whl", "@rules_pycross_pypi_deps_urllib3//:whl", "@rules_pycross_pypi_deps_virtualenv//:whl", "@rules_pycross_pypi_deps_wheel//:whl", "@rules_pycross_pypi_deps_pip//:whl"]
 
 _packages = [('rules_pycross_pypi_deps_blinker', 'blinker==1.4     --hash=sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6'), ('rules_pycross_pypi_deps_build', 'build==0.8.0     --hash=sha256:19b0ed489f92ace6947698c3ca8436cb0556a66e2aa2d34cd70e2a5d27cd0437     --hash=sha256:887a6d471c901b1a6e6574ebaeeebb45e5269a79d095fe9a8f88d6614ed2e5f0'), ('rules_pycross_pypi_deps_cachecontrol', 'cachecontrol[filecache]==0.12.11     --hash=sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b     --hash=sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144'), ('rules_pycross_pypi_deps_certifi', 'certifi==2022.6.15     --hash=sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d     --hash=sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412'), ('rules_pycross_pypi_deps_charset_normalizer', 'charset-normalizer==2.1.0     --hash=sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5     --hash=sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413'), ('rules_pycross_pypi_deps_commonmark', 'commonmark==0.9.1     --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60     --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9'), ('rules_pycross_pypi_deps_dacite', 'dacite==1.6.0     --hash=sha256:4331535f7aabb505c732fa4c3c094313fc0a1d5ea19907bf4726a7819a68b93f     --hash=sha256:d48125ed0a0352d3de9f493bf980038088f45f3f9d7498f090b50a847daaa6df'), ('rules_pycross_pypi_deps_distlib', 'distlib==0.3.4     --hash=sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b     --hash=sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579'), ('rules_pycross_pypi_deps_filelock', 'filelock==3.7.1     --hash=sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404     --hash=sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04'), ('rules_pycross_pypi_deps_findpython', 'findpython==0.2.0     --hash=sha256:110ec222a43aca3fcd154fd90b911f465c70e86787ae0532bab2266a95870fc9     --hash=sha256:c2099ee0b71fc2714b64f68fd1f40bc0ee47f49dfe9547fb64d7cbcc02fe0871'), ('rules_pycross_pypi_deps_idna', 'idna==3.3     --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff     --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d'), ('rules_pycross_pypi_deps_installer', 'installer==0.5.1     --hash=sha256:1d6c8d916ed82771945b9c813699e6f57424ded970c9d8bf16bbc23e1e826ed3     --hash=sha256:f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445'), ('rules_pycross_pypi_deps_lockfile', 'lockfile==0.12.2     --hash=sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799     --hash=sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa'), ('rules_pycross_pypi_deps_msgpack', 'msgpack==1.0.4     --hash=sha256:002b5c72b6cd9b4bafd790f364b8480e859b4712e91f43014fe01e4f957b8467     --hash=sha256:0a68d3ac0104e2d3510de90a1091720157c319ceeb90d74f7b5295a6bee51bae     --hash=sha256:0df96d6eaf45ceca04b3f3b4b111b86b33785683d682c655063ef8057d61fd92     --hash=sha256:0dfe3947db5fb9ce52aaea6ca28112a170db9eae75adf9339a1aec434dc954ef     --hash=sha256:0e3590f9fb9f7fbc36df366267870e77269c03172d086fa76bb4eba8b2b46624     --hash=sha256:11184bc7e56fd74c00ead4f9cc9a3091d62ecb96e97653add7a879a14b003227     --hash=sha256:112b0f93202d7c0fef0b7810d465fde23c746a2d482e1e2de2aafd2ce1492c88     --hash=sha256:1276e8f34e139aeff1c77a3cefb295598b504ac5314d32c8c3d54d24fadb94c9     --hash=sha256:1576bd97527a93c44fa856770197dec00d223b0b9f36ef03f65bac60197cedf8     --hash=sha256:1e91d641d2bfe91ba4c52039adc5bccf27c335356055825c7f88742c8bb900dd     --hash=sha256:26b8feaca40a90cbe031b03d82b2898bf560027160d3eae1423f4a67654ec5d6     --hash=sha256:2999623886c5c02deefe156e8f869c3b0aaeba14bfc50aa2486a0415178fce55     --hash=sha256:2a2df1b55a78eb5f5b7d2a4bb221cd8363913830145fad05374a80bf0877cb1e     --hash=sha256:2bb8cdf50dd623392fa75525cce44a65a12a00c98e1e37bf0fb08ddce2ff60d2     --hash=sha256:2cc5ca2712ac0003bcb625c96368fd08a0f86bbc1a5578802512d87bc592fe44     --hash=sha256:35bc0faa494b0f1d851fd29129b2575b2e26d41d177caacd4206d81502d4c6a6     --hash=sha256:3c11a48cf5e59026ad7cb0dc29e29a01b5a66a3e333dc11c04f7e991fc5510a9     --hash=sha256:449e57cc1ff18d3b444eb554e44613cffcccb32805d16726a5494038c3b93dab     --hash=sha256:462497af5fd4e0edbb1559c352ad84f6c577ffbbb708566a0abaaa84acd9f3ae     --hash=sha256:4733359808c56d5d7756628736061c432ded018e7a1dff2d35a02439043321aa     --hash=sha256:48f5d88c99f64c456413d74a975bd605a9b0526293218a3b77220a2c15458ba9     --hash=sha256:49565b0e3d7896d9ea71d9095df15b7f75a035c49be733051c34762ca95bbf7e     --hash=sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250     --hash=sha256:4d5834a2a48965a349da1c5a79760d94a1a0172fbb5ab6b5b33cbf8447e109ce     --hash=sha256:4dea20515f660aa6b7e964433b1808d098dcfcabbebeaaad240d11f909298075     --hash=sha256:545e3cf0cf74f3e48b470f68ed19551ae6f9722814ea969305794645da091236     --hash=sha256:63e29d6e8c9ca22b21846234913c3466b7e4ee6e422f205a2988083de3b08cae     --hash=sha256:6916c78f33602ecf0509cc40379271ba0f9ab572b066bd4bdafd7434dee4bc6e     --hash=sha256:6a4192b1ab40f8dca3f2877b70e63799d95c62c068c84dc028b40a6cb03ccd0f     --hash=sha256:6c9566f2c39ccced0a38d37c26cc3570983b97833c365a6044edef3574a00c08     --hash=sha256:76ee788122de3a68a02ed6f3a16bbcd97bc7c2e39bd4d94be2f1821e7c4a64e6     --hash=sha256:7760f85956c415578c17edb39eed99f9181a48375b0d4a94076d84148cf67b2d     --hash=sha256:77ccd2af37f3db0ea59fb280fa2165bf1b096510ba9fe0cc2bf8fa92a22fdb43     --hash=sha256:81fc7ba725464651190b196f3cd848e8553d4d510114a954681fd0b9c479d7e1     --hash=sha256:85f279d88d8e833ec015650fd15ae5eddce0791e1e8a59165318f371158efec6     --hash=sha256:9667bdfdf523c40d2511f0e98a6c9d3603be6b371ae9a238b7ef2dc4e7a427b0     --hash=sha256:a75dfb03f8b06f4ab093dafe3ddcc2d633259e6c3f74bb1b01996f5d8aa5868c     --hash=sha256:ac5bd7901487c4a1dd51a8c58f2632b15d838d07ceedaa5e4c080f7190925bff     --hash=sha256:aca0f1644d6b5a73eb3e74d4d64d5d8c6c3d577e753a04c9e9c87d07692c58db     --hash=sha256:b17be2478b622939e39b816e0aa8242611cc8d3583d1cd8ec31b249f04623243     --hash=sha256:c1683841cd4fa45ac427c18854c3ec3cd9b681694caf5bff04edb9387602d661     --hash=sha256:c23080fdeec4716aede32b4e0ef7e213c7b1093eede9ee010949f2a418ced6ba     --hash=sha256:d5b5b962221fa2c5d3a7f8133f9abffc114fe218eb4365e40f17732ade576c8e     --hash=sha256:d603de2b8d2ea3f3bcb2efe286849aa7a81531abc52d8454da12f46235092bcb     --hash=sha256:e83f80a7fec1a62cf4e6c9a660e39c7f878f603737a0cdac8c13131d11d97f52     --hash=sha256:eb514ad14edf07a1dbe63761fd30f89ae79b42625731e1ccf5e1f1092950eaa6     --hash=sha256:eba96145051ccec0ec86611fe9cf693ce55f2a3ce89c06ed307de0e085730ec1     --hash=sha256:ed6f7b854a823ea44cf94919ba3f727e230da29feb4a99711433f25800cf747f     --hash=sha256:f0029245c51fd9473dc1aede1160b0a29f4a912e6b1dd353fa6d317085b219da     --hash=sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f     --hash=sha256:fb62ea4b62bfcb0b380d5680f9a4b3f9a2d166d9394e9bbd9666c0ee09a3645c     --hash=sha256:fcb8a47f43acc113e24e910399376f7277cf8508b27e5b88499f053de6b115a8'), ('rules_pycross_pypi_deps_packaging', 'packaging==21.3     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522'), ('rules_pycross_pypi_deps_pdm', 'pdm==2.1.3     --hash=sha256:5e600883ea4beab13692234a60fe991df4b918adcd6eab0f97edd82642142a11     --hash=sha256:6fa50be65778c34148125d8fe36f8d21516f10bb306690319022181080625875'), ('rules_pycross_pypi_deps_pdm_pep517', 'pdm-pep517==1.0.1     --hash=sha256:95aa857a90e3e84088138b8da7b49a5ee79f26550adb7e4ee575db7e5bce5b6f     --hash=sha256:d159dd5f79027189a773567996f8f8e1e7c53a4ad2b518b58e62021370c0512c'), ('rules_pycross_pypi_deps_pep517', 'pep517==0.12.0     --hash=sha256:931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0     --hash=sha256:dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161'), ('rules_pycross_pypi_deps_platformdirs', 'platformdirs==2.5.2     --hash=sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788     --hash=sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19'), ('rules_pycross_pypi_deps_poetry_core', 'poetry-core==1.1.0     --hash=sha256:d145ae121cf79118a8901b60f2c951c4edcc16f55eb8aaefc156aa33aa921f07     --hash=sha256:da16a12054bf3f1ff8656d4c289f99c3d6b7704d272fb174004c4dc82e045954'), ('rules_pycross_pypi_deps_pygments', 'pygments==2.12.0     --hash=sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb     --hash=sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519'), ('rules_pycross_pypi_deps_pyparsing', 'pyparsing==3.0.7     --hash=sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea     --hash=sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484'), ('rules_pycross_pypi_deps_python_dotenv', 'python-dotenv==0.20.0     --hash=sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f     --hash=sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938'), ('rules_pycross_pypi_deps_requests', 'requests==2.28.1     --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983     --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349'), ('rules_pycross_pypi_deps_requests_toolbelt', 'requests-toolbelt==0.9.1     --hash=sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f     --hash=sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0'), ('rules_pycross_pypi_deps_resolvelib', 'resolvelib==0.8.1     --hash=sha256:c6ea56732e9fb6fca1b2acc2ccc68a0b6b8c566d8f3e78e0443310ede61dbd37     --hash=sha256:d9b7907f055c3b3a2cfc56c914ffd940122915826ff5fb5b1de0c99778f4de98'), ('rules_pycross_pypi_deps_rich', 'rich==12.4.4     --hash=sha256:4c586de507202505346f3e32d1363eb9ed6932f0c2f63184dea88983ff4971e2     --hash=sha256:d2bbd99c320a2532ac71ff6a3164867884357da3e3301f0240090c5d2fdac7ec'), ('rules_pycross_pypi_deps_shellingham', 'shellingham==1.4.0     --hash=sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e     --hash=sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9'), ('rules_pycross_pypi_deps_six', 'six==1.16.0     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254'), ('rules_pycross_pypi_deps_tomli', 'tomli==2.0.1     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'), ('rules_pycross_pypi_deps_tomlkit', 'tomlkit==0.11.0     --hash=sha256:0f4050db66fd445b885778900ce4dd9aea8c90c4721141fde0d6ade893820ef1     --hash=sha256:71ceb10c0eefd8b8f11fe34e8a51ad07812cb1dc3de23247425fbc9ddc47b9dd'), ('rules_pycross_pypi_deps_typing_extensions', 'typing-extensions==4.3.0     --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02     --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6'), ('rules_pycross_pypi_deps_unearth', 'unearth==0.6.1     --hash=sha256:3aad41a7657ad27d00895b6bd9925da0045fc843da06080488cf1b6d77b496ad     --hash=sha256:4b7bfbd7d34a11673d80dfae7fabbf921c139aac78383fb0ca16a90d3b53a66e'), ('rules_pycross_pypi_deps_urllib3', 'urllib3==1.26.9     --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14     --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e'), ('rules_pycross_pypi_deps_virtualenv', 'virtualenv==20.15.1     --hash=sha256:288171134a2ff3bfb1a2f54f119e77cd1b81c29fc1265a2356f3e8d14c7d58c4     --hash=sha256:b30aefac647e86af6d82bfc944c556f8f1a9c90427b2fb4e3bfbf338cb82becf'), ('rules_pycross_pypi_deps_wheel', 'wheel==0.37.1     --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a     --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4'), ('rules_pycross_pypi_deps_pip', 'pip==22.2.2     --hash=sha256:3fd1929db052f056d7a998439176d3333fa1b3f6c1ad881de1885c0717608a4b     --hash=sha256:b61a374b5bc40a6e982426aede40c9b5a08ff20e640f5b56977f4f91fed1e39a')]
-_config = {'enable_implicit_namespace_pkgs': False, 'environment': {}, 'extra_pip_args': [], 'isolated': True, 'pip_data_exclude': [], 'python_interpreter': 'python3', 'python_interpreter_target': None, 'quiet': True, 'repo': 'rules_pycross_pypi_deps', 'repo_prefix': 'rules_pycross_pypi_deps_', 'timeout': 600}
+_config = {'download_only': False, 'enable_implicit_namespace_pkgs': False, 'environment': {}, 'extra_pip_args': [], 'isolated': True, 'pip_data_exclude': [], 'python_interpreter': 'python3', 'python_interpreter_target': None, 'quiet': True, 'repo': 'rules_pycross_pypi_deps', 'repo_prefix': 'rules_pycross_pypi_deps_', 'timeout': 600}
 _annotations = {}
 
 def _clean_name(name):
@@ -40,11 +40,13 @@ def _get_annotation(requirement):
     name = requirement.split(" ")[0].split("=")[0]
     return _annotations.get(name)
 
-def install_deps():
+def install_deps(**whl_library_kwargs):
+    whl_config = dict(_config)
+    whl_config.update(whl_library_kwargs)
     for name, requirement in _packages:
         whl_library(
             name = name,
             requirement = requirement,
             annotation = _get_annotation(requirement),
-            **_config
+            **whl_config
         )

pycross/repositories.bzl

@@ -17,7 +17,7 @@ load("//pycross/private:pypi_requirements.bzl", "install_deps")
 # ours took precedence. Such breakages are challenging for users, so any
 # changes in this function should be marked as BREAKING in the commit message
 # and released only in semver majors.
-def rules_pycross_dependencies():
+def rules_pycross_dependencies(python_interpreter_target=None):
     # The minimal version of bazel_skylib we require
     maybe(
         http_archive,
@@ -30,4 +30,4 @@ def rules_pycross_dependencies():
     )
 
     pip_install_dependencies()
-    install_deps()
+    install_deps(python_interpreter_target=python_interpreter_target)