From d986ae526bab6830b8123976d014a4c4e8fe8add Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 30 Jan 2022 20:39:03 +0100 Subject: [PATCH] Python: Removes hack making stdist build work --- .github/workflows/release.yml | 8 -------- python/pyproject.toml | 3 --- 2 files changed, 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7d48164..efab7714 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,7 +66,6 @@ jobs: publish_pypi_linux: runs-on: ubuntu-latest - needs: publish_crates strategy: matrix: architecture: [ "x86_64", "aarch64" ] @@ -74,7 +73,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - run: sed 's/%arch%/${{ matrix.architecture }}/g' .github/workflows/manylinux_build.sh > .github/workflows/manylinux_build_script.sh - run: docker run -v "$(pwd)":/workdir --platform linux/${{ matrix.architecture }} quay.io/pypa/manylinux2014_${{ matrix.architecture }} /bin/bash /workdir/.github/workflows/manylinux_build_script.sh - uses: pypa/gh-action-pypi-publish@release/v1 @@ -88,7 +86,6 @@ jobs: publish_pypi_mac: runs-on: macos-latest - needs: publish_crates env: DEVELOPER_DIR: '/Applications/Xcode.app/Contents/Developer' SDKROOT: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' @@ -102,7 +99,6 @@ jobs: python-version: 3.7 - run: rustup update && rustup target add aarch64-apple-darwin - run: pip install maturin - - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - run: maturin build --release --no-sdist --universal2 -m python/Cargo.toml - run: maturin build --release --no-sdist -m python/Cargo.toml - uses: pypa/gh-action-pypi-publish@release/v1 @@ -116,7 +112,6 @@ jobs: publish_pypi_windows: runs-on: windows-latest - needs: publish_crates steps: - uses: actions/checkout@v2 with: @@ -127,7 +122,6 @@ jobs: - run: rustup update - run: pip install maturin - run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse - - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - run: maturin build --release --no-sdist -m python/Cargo.toml - uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -140,13 +134,11 @@ jobs: publish_pypi_stdist: runs-on: ubuntu-latest - needs: publish_crates steps: - uses: actions/checkout@v2 with: submodules: true - run: pip install maturin - - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - run: maturin sdist -m python/Cargo.toml - uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/python/pyproject.toml b/python/pyproject.toml index 7fac216a..5e8eb011 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -27,6 +27,3 @@ Documentation = "https://oxigraph.org/pyoxigraph/" Homepage = "https://oxigraph.org/pyoxigraph/" Source = "https://github.com/oxigraph/oxigraph/tree/master/python" Tracker = "https://github.com/oxigraph/oxigraph/issues" - -[tool.maturin] -cargo-extra-args = "--frozen"