From a96956361738132f6891c6bd1b5220ce951fd2d4 Mon Sep 17 00:00:00 2001 From: Tpt Date: Thu, 9 Dec 2021 17:25:32 +0100 Subject: [PATCH] Uses Rustls everywhere Avoids linking problems with system libraries. Rustls uses the system certificates. --- .github/workflows/build.yml | 2 +- lib/Cargo.toml | 2 +- python/Cargo.toml | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71091d60..78c60e9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: manylinux: 2014 container: messense/manylinux2014-cross:x86_64 command: build - args: -m python/Cargo.toml --cargo-extra-args="--no-default-features --features vendored" + args: -m python/Cargo.toml - run: pip install pyoxigraph --no-index --find-links ../../target/wheels && python -m unittest working-directory: ./python/tests diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 168e11b0..3edd7b12 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -19,7 +19,7 @@ all-features = true [features] default = [] sophia = ["sophia_api"] -http_client = ["oxhttp"] +http_client = ["oxhttp", "oxhttp/rustls"] [dependencies] quick-xml = "0.22" diff --git a/python/Cargo.toml b/python/Cargo.toml index 1a0b1a29..bebcc321 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -19,7 +19,3 @@ doctest = false oxigraph = { version = "0.3.0-dev", path="../lib", features = ["http_client"] } pyo3 = { version = "0.15", features = ["extension-module", "abi3-py37"] } oxhttp = "0.1" - -[features] -default = ["oxhttp/native-tls"] -vendored = ["oxhttp/rustls"]