diff --git a/pdm.lock b/pdm.lock index d901b9ef..dea86a9f 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "build", "core", "repairwheel"] strategy = ["cross_platform", "static_urls"] lock_version = "4.4.1" -content_hash = "sha256:2a0144b44fe7188bda7236fa5d6340d53fd4303bf5d9ede7ba46dd4714b5dd2a" +content_hash = "sha256:58210034e1d6e749f0a0d1e8670a6c7cb706a794bdb7d9ebcee61df42a3d29fc" [[package]] name = "altgraph" @@ -55,28 +55,28 @@ files = [ [[package]] name = "delvewheel" -version = "1.5.2" +version = "1.6.0" requires_python = ">=3.7" summary = "Self-contained wheels for Windows" dependencies = [ "pefile", ] files = [ - {url = "https://files.pythonhosted.org/packages/3f/cc/2f244482c66ed41aeabc328af4817521e98d7a9695b661d5a6595a31b10a/delvewheel-1.5.2.tar.gz", hash = "sha256:fde628c128536665c3899c47f4df849c905e7f3f850948639b02f209c1cb289f"}, - {url = "https://files.pythonhosted.org/packages/58/f0/1d2d0496131d23fca5661d31e386a5b1806672570c1f39c4a5106dbe92c3/delvewheel-1.5.2-py3-none-any.whl", hash = "sha256:83eddfb42c406ce26be91604127695afff53045a3e68de8bc3499ba5997843cc"}, + {url = "https://files.pythonhosted.org/packages/24/f7/35e5657954452f6c221969e67a7c69433b1f230dc076cf49e5a9186a7fd4/delvewheel-1.6.0-py3-none-any.whl", hash = "sha256:15be02e749caacafdd51c283175a041a3f467484a1a96fc2d36340ced6869bff"}, + {url = "https://files.pythonhosted.org/packages/78/20/c62d194a3ad524d2f26687a908d5cb621d4f0695af23778a1d65f314050e/delvewheel-1.6.0.tar.gz", hash = "sha256:fb2bfc91183330297898992a6b25bde8b1c542f73c4242b73cbef9c747ebcd9b"}, ] [[package]] name = "importlib-metadata" -version = "7.0.1" +version = "7.1.0" requires_python = ">=3.8" summary = "Read metadata from Python packages" dependencies = [ "zipp>=0.5", ] files = [ - {url = "https://files.pythonhosted.org/packages/90/b4/206081fca69171b4dc1939e77b378a7b87021b0f43ce07439d49d8ac5c84/importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, - {url = "https://files.pythonhosted.org/packages/c0/8b/d8427f023c081a8303e6ac7209c16e6878f2765d5b59667f3903fbcfd365/importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, + {url = "https://files.pythonhosted.org/packages/2d/0a/679461c511447ffaf176567d5c496d1de27cbe34a87df6677d7171b2fbd4/importlib_metadata-7.1.0-py3-none-any.whl", hash = "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570"}, + {url = "https://files.pythonhosted.org/packages/a0/fc/c4e6078d21fc4fa56300a241b87eae76766aa380a23fc450fc85bb7bf547/importlib_metadata-7.1.0.tar.gz", hash = "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"}, ] [[package]] @@ -143,29 +143,26 @@ files = [ [[package]] name = "pyelftools" -version = "0.30" +version = "0.31" summary = "Library for analyzing ELF files and DWARF debugging information" files = [ - {url = "https://files.pythonhosted.org/packages/33/f9/281a411a5281b674b10830a2f312c64464b49916d097b8919f009de579e0/pyelftools-0.30-py2.py3-none-any.whl", hash = "sha256:544c3440eddb9a0dce70b6611de0b28163d71def759d2ed57a0d00118fc5da86"}, - {url = "https://files.pythonhosted.org/packages/84/05/fd41cd647de044d1ffec90ce5aaae935126ac217f8ecb302186655284fc8/pyelftools-0.30.tar.gz", hash = "sha256:2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40"}, + {url = "https://files.pythonhosted.org/packages/88/56/0f2d69ed9a0060da009f672ddec8a71c041d098a66f6b1d80264bf6bbdc0/pyelftools-0.31.tar.gz", hash = "sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99"}, + {url = "https://files.pythonhosted.org/packages/f8/64/711030d9fe9ccaf6ee3ab1bcf4801c6bb3d0e585af18824a50b016b4f39c/pyelftools-0.31-py3-none-any.whl", hash = "sha256:f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607"}, ] [[package]] name = "pyproject-hooks" -version = "1.0.0" +version = "1.1.0" requires_python = ">=3.7" summary = "Wrappers to call pyproject.toml-based build backend hooks." -dependencies = [ - "tomli>=1.1.0; python_version < \"3.11\"", -] files = [ - {url = "https://files.pythonhosted.org/packages/25/c1/374304b8407d3818f7025457b7366c8e07768377ce12edfe2aa58aa0f64c/pyproject_hooks-1.0.0.tar.gz", hash = "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5"}, - {url = "https://files.pythonhosted.org/packages/d5/ea/9ae603de7fbb3df820b23a70f6aff92bf8c7770043254ad8d2dc9d6bcba4/pyproject_hooks-1.0.0-py3-none-any.whl", hash = "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8"}, + {url = "https://files.pythonhosted.org/packages/ae/f3/431b9d5fe7d14af7a32340792ef43b8a714e7726f1d7b69cc4e8e7a3f1d7/pyproject_hooks-1.1.0-py3-none-any.whl", hash = "sha256:7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2"}, + {url = "https://files.pythonhosted.org/packages/c7/07/6f63dda440d4abb191b91dc383b472dae3dd9f37e4c1e4a5c3db150531c6/pyproject_hooks-1.1.0.tar.gz", hash = "sha256:4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965"}, ] [[package]] name = "repairwheel" -version = "0.2.8" +version = "0.3.1" requires_python = ">=3.8" summary = "Repair any wheel, anywhere" dependencies = [ @@ -176,8 +173,8 @@ dependencies = [ "pyelftools>=0.24", ] files = [ - {url = "https://files.pythonhosted.org/packages/06/a9/d40432111cd6629cea8a5ed489427169d690e29711393a106053fbfec8d2/repairwheel-0.2.8-py3-none-any.whl", hash = "sha256:185133fe9a09d2773dc7ffaac419c9300285ba2859eadc4bfd376bc1e3740da1"}, - {url = "https://files.pythonhosted.org/packages/19/48/7222a6e4c8e4da4884e2bcab1e3146cfe26ab740bad2ee949075040585ec/repairwheel-0.2.8.tar.gz", hash = "sha256:222c368733ea02adae2b394f87818bc1babe5d990785d17bd651a28a167fb3ab"}, + {url = "https://files.pythonhosted.org/packages/9a/c4/a22f2a9807661d4f9375a46738695c6f2441821b78c09d3943c93875267a/repairwheel-0.3.1-py3-none-any.whl", hash = "sha256:d42b00b4ce9a2a398771ddd9a554cf58390e2a982d2b1376384970b2651f3688"}, + {url = "https://files.pythonhosted.org/packages/ec/6c/2cf3a3c35c07109c7cded00a2ca0668dc09b83c8aa8df264db66a3228baf/repairwheel-0.3.1.tar.gz", hash = "sha256:38d7149f628971d32df6c40fc4f36ceb1be8e887a8136f269421a94b986e79ae"}, ] [[package]] @@ -192,10 +189,10 @@ files = [ [[package]] name = "zipp" -version = "3.17.0" +version = "3.19.2" requires_python = ">=3.8" summary = "Backport of pathlib-compatible object wrapper for zip files" files = [ - {url = "https://files.pythonhosted.org/packages/58/03/dd5ccf4e06dec9537ecba8fcc67bbd4ea48a2791773e469e73f94c3ba9a6/zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, - {url = "https://files.pythonhosted.org/packages/d9/66/48866fc6b158c81cc2bfecc04c480f105c6040e8b077bc54c634b4a67926/zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {url = "https://files.pythonhosted.org/packages/20/38/f5c473fe9b90c8debdd29ea68d5add0289f1936d6f923b6b9cc0b931194c/zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"}, + {url = "https://files.pythonhosted.org/packages/d3/20/b48f58857d98dcb78f9e30ed2cfe533025e2e9827bbd36ea0a64cc00cbc1/zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"}, ] diff --git a/pycross/private/pycross_deps.lock.bzl b/pycross/private/pycross_deps.lock.bzl index 6bce3f91..0229b860 100644 --- a/pycross/private/pycross_deps.lock.bzl +++ b/pycross/private/pycross_deps.lock.bzl @@ -13,7 +13,7 @@ PINS = { "packaging": "packaging@23.2", "pip": "pip@23.3.1", "poetry-core": "poetry-core@1.8.1", - "repairwheel": "repairwheel@0.2.8", + "repairwheel": "repairwheel@0.3.1", "tomli": "tomli@2.0.1", } @@ -47,9 +47,9 @@ def targets(): ) _build_1_0_3_deps = [ - ":importlib-metadata@7.0.1", + ":importlib-metadata@7.1.0", ":packaging@23.2", - ":pyproject-hooks@1.0.0", + ":pyproject-hooks@1.1.0", ":tomli@2.0.1", ] @@ -74,34 +74,34 @@ def targets(): wheel = ":_wheel_dacite@1.6.0", ) - _delvewheel_1_5_2_deps = [ + _delvewheel_1_6_0_deps = [ ":pefile@2023.2.7", ] native.alias( - name = "_wheel_delvewheel@1.5.2", - actual = "@rules_pycross_internal_deps_wheel_delvewheel_1.5.2_py3_none_any//file", + name = "_wheel_delvewheel@1.6.0", + actual = "@rules_pycross_internal_deps_wheel_delvewheel_1.6.0_py3_none_any//file", ) pycross_wheel_library( - name = "delvewheel@1.5.2", - deps = _delvewheel_1_5_2_deps, - wheel = ":_wheel_delvewheel@1.5.2", + name = "delvewheel@1.6.0", + deps = _delvewheel_1_6_0_deps, + wheel = ":_wheel_delvewheel@1.6.0", ) - _importlib_metadata_7_0_1_deps = [ - ":zipp@3.17.0", + _importlib_metadata_7_1_0_deps = [ + ":zipp@3.19.2", ] native.alias( - name = "_wheel_importlib-metadata@7.0.1", - actual = "@rules_pycross_internal_deps_wheel_importlib_metadata_7.0.1_py3_none_any//file", + name = "_wheel_importlib-metadata@7.1.0", + actual = "@rules_pycross_internal_deps_wheel_importlib_metadata_7.1.0_py3_none_any//file", ) pycross_wheel_library( - name = "importlib-metadata@7.0.1", - deps = _importlib_metadata_7_0_1_deps, - wheel = ":_wheel_importlib-metadata@7.0.1", + name = "importlib-metadata@7.1.0", + deps = _importlib_metadata_7_1_0_deps, + wheel = ":_wheel_importlib-metadata@7.1.0", ) native.alias( @@ -170,47 +170,42 @@ def targets(): ) native.alias( - name = "_wheel_pyelftools@0.30", - actual = "@rules_pycross_internal_deps_wheel_pyelftools_0.30_py2.py3_none_any//file", + name = "_wheel_pyelftools@0.31", + actual = "@rules_pycross_internal_deps_wheel_pyelftools_0.31_py3_none_any//file", ) pycross_wheel_library( - name = "pyelftools@0.30", - wheel = ":_wheel_pyelftools@0.30", + name = "pyelftools@0.31", + wheel = ":_wheel_pyelftools@0.31", ) - _pyproject_hooks_1_0_0_deps = [ - ":tomli@2.0.1", - ] - native.alias( - name = "_wheel_pyproject-hooks@1.0.0", - actual = "@rules_pycross_internal_deps_wheel_pyproject_hooks_1.0.0_py3_none_any//file", + name = "_wheel_pyproject-hooks@1.1.0", + actual = "@rules_pycross_internal_deps_wheel_pyproject_hooks_1.1.0_py3_none_any//file", ) pycross_wheel_library( - name = "pyproject-hooks@1.0.0", - deps = _pyproject_hooks_1_0_0_deps, - wheel = ":_wheel_pyproject-hooks@1.0.0", + name = "pyproject-hooks@1.1.0", + wheel = ":_wheel_pyproject-hooks@1.1.0", ) - _repairwheel_0_2_8_deps = [ - ":delvewheel@1.5.2", + _repairwheel_0_3_1_deps = [ + ":delvewheel@1.6.0", ":macholib@1.16.3", ":packaging@23.2", ":pefile@2023.2.7", - ":pyelftools@0.30", + ":pyelftools@0.31", ] native.alias( - name = "_wheel_repairwheel@0.2.8", - actual = "@rules_pycross_internal_deps_wheel_repairwheel_0.2.8_py3_none_any//file", + name = "_wheel_repairwheel@0.3.1", + actual = "@rules_pycross_internal_deps_wheel_repairwheel_0.3.1_py3_none_any//file", ) pycross_wheel_library( - name = "repairwheel@0.2.8", - deps = _repairwheel_0_2_8_deps, - wheel = ":_wheel_repairwheel@0.2.8", + name = "repairwheel@0.3.1", + deps = _repairwheel_0_3_1_deps, + wheel = ":_wheel_repairwheel@0.3.1", ) native.alias( @@ -224,13 +219,13 @@ def targets(): ) native.alias( - name = "_wheel_zipp@3.17.0", - actual = "@rules_pycross_internal_deps_wheel_zipp_3.17.0_py3_none_any//file", + name = "_wheel_zipp@3.19.2", + actual = "@rules_pycross_internal_deps_wheel_zipp_3.19.2_py3_none_any//file", ) pycross_wheel_library( - name = "zipp@3.17.0", - wheel = ":_wheel_zipp@3.17.0", + name = "zipp@3.19.2", + wheel = ":_wheel_zipp@3.19.2", ) # buildifier: disable=unnamed-macro @@ -269,22 +264,22 @@ def repositories(): maybe( http_file, - name = "rules_pycross_internal_deps_wheel_delvewheel_1.5.2_py3_none_any", + name = "rules_pycross_internal_deps_wheel_delvewheel_1.6.0_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/58/f0/1d2d0496131d23fca5661d31e386a5b1806672570c1f39c4a5106dbe92c3/delvewheel-1.5.2-py3-none-any.whl", + "https://files.pythonhosted.org/packages/24/f7/35e5657954452f6c221969e67a7c69433b1f230dc076cf49e5a9186a7fd4/delvewheel-1.6.0-py3-none-any.whl", ], - sha256 = "83eddfb42c406ce26be91604127695afff53045a3e68de8bc3499ba5997843cc", - downloaded_file_path = "delvewheel-1.5.2-py3-none-any.whl", + sha256 = "15be02e749caacafdd51c283175a041a3f467484a1a96fc2d36340ced6869bff", + downloaded_file_path = "delvewheel-1.6.0-py3-none-any.whl", ) maybe( http_file, - name = "rules_pycross_internal_deps_wheel_importlib_metadata_7.0.1_py3_none_any", + name = "rules_pycross_internal_deps_wheel_importlib_metadata_7.1.0_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/c0/8b/d8427f023c081a8303e6ac7209c16e6878f2765d5b59667f3903fbcfd365/importlib_metadata-7.0.1-py3-none-any.whl", + "https://files.pythonhosted.org/packages/2d/0a/679461c511447ffaf176567d5c496d1de27cbe34a87df6677d7171b2fbd4/importlib_metadata-7.1.0-py3-none-any.whl", ], - sha256 = "4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e", - downloaded_file_path = "importlib_metadata-7.0.1-py3-none-any.whl", + sha256 = "30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570", + downloaded_file_path = "importlib_metadata-7.1.0-py3-none-any.whl", ) maybe( @@ -349,32 +344,32 @@ def repositories(): maybe( http_file, - name = "rules_pycross_internal_deps_wheel_pyelftools_0.30_py2.py3_none_any", + name = "rules_pycross_internal_deps_wheel_pyelftools_0.31_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/33/f9/281a411a5281b674b10830a2f312c64464b49916d097b8919f009de579e0/pyelftools-0.30-py2.py3-none-any.whl", + "https://files.pythonhosted.org/packages/f8/64/711030d9fe9ccaf6ee3ab1bcf4801c6bb3d0e585af18824a50b016b4f39c/pyelftools-0.31-py3-none-any.whl", ], - sha256 = "544c3440eddb9a0dce70b6611de0b28163d71def759d2ed57a0d00118fc5da86", - downloaded_file_path = "pyelftools-0.30-py2.py3-none-any.whl", + sha256 = "f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607", + downloaded_file_path = "pyelftools-0.31-py3-none-any.whl", ) maybe( http_file, - name = "rules_pycross_internal_deps_wheel_pyproject_hooks_1.0.0_py3_none_any", + name = "rules_pycross_internal_deps_wheel_pyproject_hooks_1.1.0_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/d5/ea/9ae603de7fbb3df820b23a70f6aff92bf8c7770043254ad8d2dc9d6bcba4/pyproject_hooks-1.0.0-py3-none-any.whl", + "https://files.pythonhosted.org/packages/ae/f3/431b9d5fe7d14af7a32340792ef43b8a714e7726f1d7b69cc4e8e7a3f1d7/pyproject_hooks-1.1.0-py3-none-any.whl", ], - sha256 = "283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8", - downloaded_file_path = "pyproject_hooks-1.0.0-py3-none-any.whl", + sha256 = "7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2", + downloaded_file_path = "pyproject_hooks-1.1.0-py3-none-any.whl", ) maybe( http_file, - name = "rules_pycross_internal_deps_wheel_repairwheel_0.2.8_py3_none_any", + name = "rules_pycross_internal_deps_wheel_repairwheel_0.3.1_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/06/a9/d40432111cd6629cea8a5ed489427169d690e29711393a106053fbfec8d2/repairwheel-0.2.8-py3-none-any.whl", + "https://files.pythonhosted.org/packages/9a/c4/a22f2a9807661d4f9375a46738695c6f2441821b78c09d3943c93875267a/repairwheel-0.3.1-py3-none-any.whl", ], - sha256 = "185133fe9a09d2773dc7ffaac419c9300285ba2859eadc4bfd376bc1e3740da1", - downloaded_file_path = "repairwheel-0.2.8-py3-none-any.whl", + sha256 = "d42b00b4ce9a2a398771ddd9a554cf58390e2a982d2b1376384970b2651f3688", + downloaded_file_path = "repairwheel-0.3.1-py3-none-any.whl", ) maybe( @@ -389,10 +384,10 @@ def repositories(): maybe( http_file, - name = "rules_pycross_internal_deps_wheel_zipp_3.17.0_py3_none_any", + name = "rules_pycross_internal_deps_wheel_zipp_3.19.2_py3_none_any", urls = [ - "https://files.pythonhosted.org/packages/d9/66/48866fc6b158c81cc2bfecc04c480f105c6040e8b077bc54c634b4a67926/zipp-3.17.0-py3-none-any.whl", + "https://files.pythonhosted.org/packages/20/38/f5c473fe9b90c8debdd29ea68d5add0289f1936d6f923b6b9cc0b931194c/zipp-3.19.2-py3-none-any.whl", ], - sha256 = "0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31", - downloaded_file_path = "zipp-3.17.0-py3-none-any.whl", + sha256 = "f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c", + downloaded_file_path = "zipp-3.19.2-py3-none-any.whl", ) diff --git a/pycross/private/tools/repairwheel/repair_wheel_hook.py b/pycross/private/tools/repairwheel/repair_wheel_hook.py index 26fa7a15..168abd30 100644 --- a/pycross/private/tools/repairwheel/repair_wheel_hook.py +++ b/pycross/private/tools/repairwheel/repair_wheel_hook.py @@ -17,6 +17,7 @@ def main() -> None: str(wheel_file), "--output-dir", str(output_dir), + "--no-sys-paths", ] for lp in lib_path: diff --git a/pyproject.toml b/pyproject.toml index cf886eb7..97068ace 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ build = [ "build==1.0.3", ] repairwheel = [ - "repairwheel==0.2.8", + "repairwheel==0.3.1", ] [tool.black]