Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
vemonet committed Apr 3, 2024
1 parent 9e7d0e5 commit a67cc85
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 13 additions & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 2 additions & 0 deletions scripts/test-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions scripts/test-r.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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");'

0 comments on commit a67cc85

Please sign in to comment.