Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci #6

Merged
merged 3 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,48 +11,48 @@ jobs:
with:
fetch-depth: 0

- name: Install latest stable rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy

- name: Run cargo fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check

- name: cache rust
uses: Swatinem/rust-cache@v2

- name: cache conda
uses: actions/cache@v4
env:
CACHE_NUMBER: 0
CACHE_NUMBER: 1
with:
path: ~/conda_pkgs_dir
key:
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}

- name: cache rust
uses: Swatinem/rust-cache@v2

- name: setup conda
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.11
python-version: 3.12
channels: conda-forge,bioconda
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
mamba-version: "*"
activate-environment: sourmash_dev
auto-activate-base: false
use-only-tar-bz2: true
# use-only-tar-bz2: true

- run: conda info
- run: conda list
- run: conda config --show

- run: mamba search rust

- name: install dependencies
shell: bash -l {0}
run: mamba install git compilers maturin pytest
run: mamba install rust==1.75.0

- name: install dependencies 2
shell: bash -l {0}
run: mamba install compilers maturin pytest pandas

- name: Run cargo fmt
run: cargo fmt --all -- --check --verbose

- name: build
shell: bash -l {0}
Expand Down
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ tokio = { version = "1.37.0", features = ["full"] }
regex = "1.10.4"
openssl = { version = "0.10", features = ["vendored"] }

[build-dependencies]
pyo3-build-config = { version = "0.21.2", features = ["resolve-config"] }

[profile.release]
#target-cpu=native
lto = "thin"
Expand Down
6 changes: 0 additions & 6 deletions build.rs

This file was deleted.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ test = [

[tool.maturin]
python-source = "src/python"
features = ["pyo3/extension-module"]

[tool.maturin.target.x86_64-apple-darwin]
macos-deployment-target = "10.14"
Expand Down