diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee34917..7979679 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,7 +74,6 @@ jobs: with: python-version: 3.12 - run: rustup update - - run: pip install -r python/requirements.txt - name: Run tests run: ./scripts/test-python.sh diff --git a/lib/Cargo.toml b/lib/Cargo.toml index bdb9e9c..4c99416 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -17,12 +17,24 @@ authors.workspace = true ptrie = "0.7" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -reqwest = { version = "0.11", features = ["blocking", "json"] } async-trait = "0.1" regex = "1.10" +reqwest = { version = "0.12", default-features = false } [dev-dependencies] tokio = { version = "1.34", features = ["rt-multi-thread", "macros"] } [package.metadata.docs.rs] all-features = true + + +# Do not use rustls-tls on Windows aarch64 due to Ring dependency https://github.com/briansmith/ring/issues/1167 +[target.'cfg(all(windows, target_arch = "aarch64"))'.dependencies.reqwest] +version = "0.12" +default-features = false +features = ["blocking", "json", "native-tls"] + +[target.'cfg(not(all(windows, target_arch = "aarch64")))'.dependencies.reqwest] +version = "0.12" +default-features = false +features = ["blocking", "json", "rustls-tls"] diff --git a/scripts/test-python.sh b/scripts/test-python.sh index 69420e1..cae1a11 100755 --- a/scripts/test-python.sh +++ b/scripts/test-python.sh @@ -18,6 +18,8 @@ fi echo "Activating virtual environment" source .venv/bin/activate +pip install -q -r python/requirements.txt + cd python if [ "$SKIP_BUILD" = false ]; then diff --git a/scripts/test-r.sh b/scripts/test-r.sh index 66f8cec..57fa999 100755 --- a/scripts/test-r.sh +++ b/scripts/test-r.sh @@ -16,9 +16,8 @@ if [ "$INSTALL_DEPS" = true ]; then Rscript -e 'install.packages("usethis")' Rscript -e 'install.packages("devtools")' Rscript -e 'install.packages("testthat")' - - # Rscript -e 'install.packages("rextendr")' - Rscript -e 'remotes::install_github("extendr/rextendr")' + Rscript -e 'install.packages("rextendr")' + # Rscript -e 'remotes::install_github("extendr/rextendr")' fi Rscript -e 'rextendr::document("./r"); library(testthat); test_dir("r/tests");'