Python: Removes hack making stdist build work

pull/190/head
Tpt 3 years ago
parent 45031db791
commit d986ae526b
  1. 8
      .github/workflows/release.yml
  2. 3
      python/pyproject.toml

@ -66,7 +66,6 @@ jobs:
publish_pypi_linux: publish_pypi_linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: publish_crates
strategy: strategy:
matrix: matrix:
architecture: [ "x86_64", "aarch64" ] architecture: [ "x86_64", "aarch64" ]
@ -74,7 +73,6 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: true 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: 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 - 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 - uses: pypa/gh-action-pypi-publish@release/v1
@ -88,7 +86,6 @@ jobs:
publish_pypi_mac: publish_pypi_mac:
runs-on: macos-latest runs-on: macos-latest
needs: publish_crates
env: env:
DEVELOPER_DIR: '/Applications/Xcode.app/Contents/Developer' DEVELOPER_DIR: '/Applications/Xcode.app/Contents/Developer'
SDKROOT: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' SDKROOT: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
@ -102,7 +99,6 @@ jobs:
python-version: 3.7 python-version: 3.7
- run: rustup update && rustup target add aarch64-apple-darwin - run: rustup update && rustup target add aarch64-apple-darwin
- run: pip install maturin - 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 --universal2 -m python/Cargo.toml
- run: maturin build --release --no-sdist -m python/Cargo.toml - run: maturin build --release --no-sdist -m python/Cargo.toml
- uses: pypa/gh-action-pypi-publish@release/v1 - uses: pypa/gh-action-pypi-publish@release/v1
@ -116,7 +112,6 @@ jobs:
publish_pypi_windows: publish_pypi_windows:
runs-on: windows-latest runs-on: windows-latest
needs: publish_crates
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -127,7 +122,6 @@ jobs:
- run: rustup update - run: rustup update
- run: pip install maturin - run: pip install maturin
- run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse - 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 - run: maturin build --release --no-sdist -m python/Cargo.toml
- uses: pypa/gh-action-pypi-publish@release/v1 - uses: pypa/gh-action-pypi-publish@release/v1
with: with:
@ -140,13 +134,11 @@ jobs:
publish_pypi_stdist: publish_pypi_stdist:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: publish_crates
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: true submodules: true
- run: pip install maturin - run: pip install maturin
- run: sed -i 's/path="..\/lib", //g' python/Cargo.toml
- run: maturin sdist -m python/Cargo.toml - run: maturin sdist -m python/Cargo.toml
- uses: pypa/gh-action-pypi-publish@release/v1 - uses: pypa/gh-action-pypi-publish@release/v1
with: with:

@ -27,6 +27,3 @@ Documentation = "https://oxigraph.org/pyoxigraph/"
Homepage = "https://oxigraph.org/pyoxigraph/" Homepage = "https://oxigraph.org/pyoxigraph/"
Source = "https://github.com/oxigraph/oxigraph/tree/master/python" Source = "https://github.com/oxigraph/oxigraph/tree/master/python"
Tracker = "https://github.com/oxigraph/oxigraph/issues" Tracker = "https://github.com/oxigraph/oxigraph/issues"
[tool.maturin]
cargo-extra-args = "--frozen"

Loading…
Cancel
Save