Skip to content

Commit 9e629d4

Browse files
committed
MORE
1 parent 40564de commit 9e629d4

File tree

2 files changed

+2
-67
lines changed

2 files changed

+2
-67
lines changed

.github/workflows/push.yml

-67
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,6 @@ on:
77
pull_request:
88

99
jobs:
10-
rust_impl:
11-
name: "Rust impl: ${{ matrix.python-version }}, ${{ matrix.rust-toolchain }}, ${{ matrix.platform.name }}"
12-
runs-on: ${{ matrix.platform.os }}
13-
strategy:
14-
matrix:
15-
# This list needs to be kept in sync with:
16-
# - tag.yml
17-
# - maturin_build_wheel.py
18-
# - the c_impl tests below
19-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
20-
rust-toolchain: [stable, beta, nightly]
21-
platform: [
22-
# This list should be kept in sync with tag.yml.
23-
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu", name: "Linux x64" },
24-
{ os: "macOS-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin", name: "macOS x64" },
25-
{ os: "macOS-11", python-architecture: "x64", rust-target: "aarch64-apple-darwin", name: "macOS ARM" },
26-
{ os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc", name: "Windows x86" },
27-
{ os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc", name: "Windows x64" },
28-
]
29-
exclude:
30-
# aarch64 macOS has no support for Python version lower than 3.8
31-
- python-version: 3.7
32-
platform:
33-
os: "macOS-11"
34-
rust-target: "aarch64-apple-darwin"
35-
fail-fast: false
36-
env:
37-
CARGO_BUILD_TARGET: ${{ matrix.platform.rust-target }}
38-
steps:
39-
- uses: actions/checkout@v3
40-
- name: Set up Python
41-
uses: actions/setup-python@v4
42-
with:
43-
python-version: ${{ matrix.python-version }}
44-
architecture: ${{ matrix.platform.python-architecture }}
45-
- run: python tests/python_info.py
46-
- name: Set up Rust
47-
uses: actions-rs/toolchain@v1
48-
with:
49-
toolchain: ${{ matrix.rust-toolchain }}
50-
target: ${{ matrix.platform.rust-target }}
51-
default: true
52-
profile: minimal
53-
# We use numpy to test the error case of trying to hash a strided buffer.
54-
- name: Install pytest and numpy
55-
run: pip install pytest numpy
56-
- name: Build and install the blake3 module
57-
run: pip install .
58-
- name: Run pytest
59-
if: ${{ matrix.platform.rust-target != 'aarch64-apple-darwin' }}
60-
run: python -u -m pytest --verbose
61-
6210
c_impl:
6311
name: "C impl: ${{ matrix.python-version }}, ${{ matrix.platform.name }}"
6412
runs-on: ${{ matrix.platform.os }}
@@ -108,18 +56,3 @@ jobs:
10856
run: pip install pytest numpy
10957
- name: Run pytest
11058
run: python -u -m pytest --verbose
111-
112-
mypy:
113-
name: "mypy"
114-
runs-on: ubuntu-latest
115-
steps:
116-
- uses: actions/checkout@v3
117-
- name: Set up Python
118-
uses: actions/setup-python@v4
119-
with:
120-
python-version: "3.12"
121-
# We use numpy to test the error case of trying to hash a strided buffer.
122-
- name: Install pytest, numpy, and mypy
123-
run: pip install pytest numpy mypy
124-
- name: Run mypy
125-
run: python -u -m mypy --strict tests/test_blake3.py

c_impl/blake3module.c

+2
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ static PyObject *Blake3_update(Blake3Object *self, PyObject *args) {
229229
// TODO: actually mmap
230230
static PyObject *Blake3_update_mmap(Blake3Object *self, PyObject *args,
231231
PyObject *kwds) {
232+
printf("JACK 0\n");
232233
PyBytesObject *path_bytes = NULL;
233234
FILE *file = NULL;
234235
PyObject *ret = NULL;
@@ -254,6 +255,7 @@ static PyObject *Blake3_update_mmap(Blake3Object *self, PyObject *args,
254255
PyErr_SetFromErrno(PyExc_OSError);
255256
goto exit;
256257
}
258+
return NULL;
257259

258260
char *buf[BUFSIZE];
259261
while (1) {

0 commit comments

Comments
 (0)