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

WIP PR for getting CI working as desired #10

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 2 additions & 4 deletions .github/workflows/test_wheel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
os: [ubuntu-22.04, windows-2019]
architecture: ['x64']
linux_archs: ["native"]
numpy_version: ["numpy~=1.23", "numpy~=1.24", "numpy~=1.25", "numpy#latest"]
include:
# https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip
- os: windows-2019
Expand All @@ -22,7 +21,7 @@ jobs:
linux_archs: native
skip: "pp* *musl*"

name: Test wheel (${{ matrix.numpy_version }} + ${{ matrix.os }})
name: Test wheel (${{ matrix.os }})
env:
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
CIBW_BEFORE_ALL: "pip install numpy cython"
Expand Down Expand Up @@ -65,11 +64,10 @@ jobs:
run: |
pip install ./wheelhouse/*.whl

- name: Run Tests after installing numpy (${{matrix.numpy_version}})
- name: Run Tests after installing
shell: bash -l {0}
run: |
pip install pytest pytest-cov
mv ./uavro ./uavro-src #in order to avoid conflicts between the uavro directory and the uavro installed module
pip install ${{matrix.numpy_version}} #installing a different numpy version than the one uavro wheel was compiled with
pytest --verbose --cov=uavro-src #verifying that uavro still works

3 changes: 3 additions & 0 deletions ci/environment-py310.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ dependencies:
- fastparquet
- pytest
- pytest-cov
- dask
- fsspec
- python-snappy
3 changes: 3 additions & 0 deletions ci/environment-py310win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ dependencies:
- fastparquet
- pytest
- pytest-cov
- dask
- fsspec
- python-snappy
3 changes: 3 additions & 0 deletions ci/environment-py311.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ dependencies:
- fastparquet
- pytest
- pytest-cov
- dask
- fsspec
- python-snappy
3 changes: 3 additions & 0 deletions ci/environment-py312.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ dependencies:
- fastparquet
- pytest
- pytest-cov
- dask
- fsspec
- python-snappy
3 changes: 3 additions & 0 deletions ci/environment-py39.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ dependencies:
- fastparquet
- pytest
- pytest-cov
- dask
- fsspec
- python-snappy
3 changes: 2 additions & 1 deletion uavro/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,9 @@ def dask_read_avro(urlpath, blocksize=100000000, storage_options=None):
passed to backend file-system
"""
from dask import delayed, compute
from dask.bytes.core import open_files, read_bytes
from dask.bytes.core import read_bytes
from dask.dataframe import from_delayed
from fsspec import open_files

storage_options = storage_options or {}
files = open_files(urlpath, **storage_options)
Expand Down
Binary file modified uavro/tests/logical.avro
Binary file not shown.
Binary file modified uavro/tests/primitive.avro
Binary file not shown.
7 changes: 4 additions & 3 deletions uavro/tests/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def generate_test_data_primitive(fn):
{"name": "d", "type": "long"},
{"name": "e", "type": "float"},
{"name": "f", "type": "double"},
{"name": "g", "type": {'type': "fixed", 'size': 4}},
{"name": "g", "type": {'type': "fixed", 'size': 4, 'name': 'g'}},
{"name": "h", "type": {'type': "enum",
"symbols": ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"]}},
"symbols": ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"], "name": "h"}},
]
}
with open(fn, 'wb') as out:
Expand Down Expand Up @@ -48,7 +48,8 @@ def generate_test_data_logical(fn):
{"name": "e", "type": {'type': "int",
'logicalType': 'date'}},
{"name": "f", "type": {'type': "bytes",
'logicalType': 'decimal', 'scale': 3}},
'logicalType': 'decimal', 'scale': 3,
'precision': 38}},
]
}
with open(fn, 'wb') as out:
Expand Down
Loading