Skip to content

Commit 59f1dab

Browse files
committed
Finally commit Cargo.lock to pin ndarray 0.15
1 parent fcd4afc commit 59f1dab

File tree

6 files changed

+2391
-31
lines changed

6 files changed

+2391
-31
lines changed

.github/workflows/lint.yml

-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ jobs:
2626
override: true
2727
components: rustfmt, clippy
2828

29-
- name: Run cargo update for ndarray 0.15
30-
uses: actions-rs/cargo@v1
31-
with:
32-
command: update
33-
args: --package ndarray:0.16.1 --precise 0.15.6
34-
3529
- name: Run cargo fmt
3630
uses: actions-rs/cargo@v1
3731
with:

.github/workflows/pytest.yml

-6
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
python -m pip install --upgrade pip
4747
pip install maturin numpy pytest poetry
4848
49-
- name: Run cargo update for ndarray 0.15
50-
uses: actions-rs/cargo@v1
51-
with:
52-
command: update
53-
args: --package ndarray:0.16.1 --precise 0.15.6
54-
5549
- name: Test Python
5650
run: |
5751
poetry install

.github/workflows/python.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: PyO3/maturin-action@v1
2929
with:
3030
target: ${{ matrix.target }}
31-
args: --release --out dist --find-interpreter -- --package ndarray:0.16.1 --precise 0.15.6
31+
args: --release --out dist --find-interpreter
3232
sccache: 'true'
3333
manylinux: auto
3434
- name: Upload wheels
@@ -52,7 +52,7 @@ jobs:
5252
uses: PyO3/maturin-action@v1
5353
with:
5454
target: ${{ matrix.target }}
55-
args: --release --out dist --find-interpreter -- --package ndarray:0.16.1 --precise 0.15.6
55+
args: --release --out dist --find-interpreter
5656
sccache: 'true'
5757
- name: Upload wheels
5858
uses: actions/upload-artifact@v3
@@ -74,7 +74,7 @@ jobs:
7474
uses: PyO3/maturin-action@v1
7575
with:
7676
target: ${{ matrix.target }}
77-
args: --release --out dist --find-interpreter -- --package ndarray:0.16.1 --precise 0.15.6
77+
args: --release --out dist --find-interpreter
7878
sccache: 'true'
7979
- name: Upload wheels
8080
uses: actions/upload-artifact@v3
@@ -90,7 +90,7 @@ jobs:
9090
uses: PyO3/maturin-action@v1
9191
with:
9292
command: build
93-
args: --sdist --out dist --release -- --package ndarray:0.16.1 --precise 0.15.6
93+
args: --sdist --out dist --release
9494
- name: Upload sdist
9595
uses: actions/upload-artifact@v3
9696
with:

.github/workflows/test.yml

-12
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ jobs:
4141
- name: Log active toolchain
4242
run: rustup show
4343

44-
- name: Run cargo update for ndarray 0.15
45-
uses: actions-rs/cargo@v1
46-
with:
47-
command: update
48-
args: --package ndarray:0.16.1 --precise 0.15.6
49-
5044
- name: Run cargo test in release mode
5145
uses: actions-rs/cargo@v1
5246
with:
@@ -78,12 +72,6 @@ jobs:
7872
- name: Log active toolchain
7973
run: rustup show
8074

81-
- name: Run cargo update for ndarray 0.15
82-
uses: actions-rs/cargo@v1
83-
with:
84-
command: update
85-
args: --package ndarray:0.16.1 --precise 0.15.6
86-
8775
- name: Run cargo test in release mode
8876
uses: actions-rs/cargo@v1
8977
with:

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
# will have compiled files and executables
33
**/target/
44

5-
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
6-
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
7-
Cargo.lock
5+
# See https://blog.rust-lang.org/2023/08/29/committing-lockfiles.html
6+
# Cargo.lock
87

98
# These are backup files generated by rustfmt
109
**/*.rs.bk

0 commit comments

Comments
 (0)