pyoxigraph: optional vendored OpenSSL

Vendored OpenSSL is only useful only for manylinux builds. We should keep using the system OpenSSL builds in the other cases.
pull/175/head
Tpt 3 years ago
parent 461a27865c
commit b8125e5743
  1. 4
      .github/workflows/build.yml
  2. 4
      .github/workflows/release.yml
  3. 5
      python/Cargo.toml

@ -94,7 +94,7 @@ jobs:
with: with:
manylinux: auto manylinux: auto
command: build command: build
args: -m python/Cargo.toml args: -m python/Cargo.toml --cargo-extra-args="--features vendored"
python_wheel_mac: python_wheel_mac:
runs-on: macos-latest runs-on: macos-latest
@ -115,6 +115,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: true submodules: true
- run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse
- run: choco install llvm -y
- uses: messense/maturin-action@v1 - uses: messense/maturin-action@v1
with: with:
command: build command: build

@ -101,7 +101,7 @@ jobs:
with: with:
manylinux: auto manylinux: auto
command: publish command: publish
args: -m python/Cargo.toml -u __token__ -p ${{ secrets.PYPI_PASSWORD }} args: -m python/Cargo.toml --cargo-extra-args="--features vendored" -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
publish_pypi_mac: publish_pypi_mac:
runs-on: macos-latest runs-on: macos-latest
needs: publish_lib_crate needs: publish_lib_crate
@ -120,6 +120,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: true submodules: true
- run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse
- run: choco install llvm -y
- uses: messense/maturin-action@v1 - uses: messense/maturin-action@v1
with: with:
command: publish command: publish

@ -18,4 +18,7 @@ doctest = false
[dependencies] [dependencies]
oxigraph = {version = "0.3.0-dev", path="../lib", features = ["http_client"]} oxigraph = {version = "0.3.0-dev", path="../lib", features = ["http_client"]}
pyo3 = {version = "0.15", features = ["extension-module", "abi3-py36"]} pyo3 = {version = "0.15", features = ["extension-module", "abi3-py36"]}
native-tls = {version = "0.2", features = ["vendored"]} native-tls = "0.2"
[features]
vendored = ["native-tls/vendored"]
Loading…
Cancel
Save