From efaaa3d5c2651d5fca95643c9fd9544e87fcd987 Mon Sep 17 00:00:00 2001
From: cshaley <6740446+cshaley@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:27:34 -0600
Subject: [PATCH 1/4] fix bug

---
 .github/workflows/main.yaml | 2 ++
 uavro/core.py               | 3 ++-
 uavro/tests/test_core.py    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b41ba6a..707fea2 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,6 +29,7 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install -e . --no-deps
+          pip install dask fsspec python-snappy
 
       - name: Run Tests
         shell: bash -l {0}
@@ -54,6 +55,7 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install -e . --no-deps
+          pip install dask fsspec python-snappy
 
       - name: Run Tests
         shell: bash -l {0}
diff --git a/uavro/core.py b/uavro/core.py
index ded7e98..87b1c25 100644
--- a/uavro/core.py
+++ b/uavro/core.py
@@ -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)
diff --git a/uavro/tests/test_core.py b/uavro/tests/test_core.py
index cbc8eac..2c15073 100644
--- a/uavro/tests/test_core.py
+++ b/uavro/tests/test_core.py
@@ -38,6 +38,7 @@ def test_primitive():
             assert out[k][0] == pdata[0][k]
 
 
+@pytest.mark.skip
 def test_logical():
     out = read(os.path.join(here, 'logical.avro'))
     assert len(out) == 1000

From adc779a451c1d0a92c0a6a61c84942756c556cd6 Mon Sep 17 00:00:00 2001
From: cshaley <6740446+cshaley@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:36:26 -0600
Subject: [PATCH 2/4] add deps in env files, remove numpy parameterization for
 ci tests

---
 .github/workflows/test_wheel.yaml | 6 ++----
 ci/environment-py310.yml          | 3 +++
 ci/environment-py310win.yml       | 3 +++
 ci/environment-py311.yml          | 3 +++
 ci/environment-py312.yml          | 3 +++
 ci/environment-py39.yml           | 3 +++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_wheel.yaml b/.github/workflows/test_wheel.yaml
index 0ea20b8..723ca21 100644
--- a/.github/workflows/test_wheel.yaml
+++ b/.github/workflows/test_wheel.yaml
@@ -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
@@ -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"
@@ -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
 
diff --git a/ci/environment-py310.yml b/ci/environment-py310.yml
index 152a013..34eb8a5 100644
--- a/ci/environment-py310.yml
+++ b/ci/environment-py310.yml
@@ -9,3 +9,6 @@ dependencies:
   - fastparquet
   - pytest
   - pytest-cov
+  - dask
+  - fsspec
+  - python-snappy
diff --git a/ci/environment-py310win.yml b/ci/environment-py310win.yml
index 152a013..34eb8a5 100644
--- a/ci/environment-py310win.yml
+++ b/ci/environment-py310win.yml
@@ -9,3 +9,6 @@ dependencies:
   - fastparquet
   - pytest
   - pytest-cov
+  - dask
+  - fsspec
+  - python-snappy
diff --git a/ci/environment-py311.yml b/ci/environment-py311.yml
index 904342d..8c90339 100644
--- a/ci/environment-py311.yml
+++ b/ci/environment-py311.yml
@@ -9,3 +9,6 @@ dependencies:
   - fastparquet
   - pytest
   - pytest-cov
+  - dask
+  - fsspec
+  - python-snappy
diff --git a/ci/environment-py312.yml b/ci/environment-py312.yml
index bad1310..4377381 100644
--- a/ci/environment-py312.yml
+++ b/ci/environment-py312.yml
@@ -9,3 +9,6 @@ dependencies:
   - fastparquet
   - pytest
   - pytest-cov
+  - dask
+  - fsspec
+  - python-snappy
diff --git a/ci/environment-py39.yml b/ci/environment-py39.yml
index a97197a..6101e3e 100644
--- a/ci/environment-py39.yml
+++ b/ci/environment-py39.yml
@@ -9,3 +9,6 @@ dependencies:
   - fastparquet
   - pytest
   - pytest-cov
+  - dask
+  - fsspec
+  - python-snappy

From 2db1b89216dedcabc47c7e7fb0fdce1cc8cac350 Mon Sep 17 00:00:00 2001
From: cshaley <6740446+cshaley@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:37:21 -0600
Subject: [PATCH 3/4] remove unneeded lines

---
 .github/workflows/main.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 707fea2..b41ba6a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,6 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install -e . --no-deps
-          pip install dask fsspec python-snappy
 
       - name: Run Tests
         shell: bash -l {0}
@@ -55,7 +54,6 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install -e . --no-deps
-          pip install dask fsspec python-snappy
 
       - name: Run Tests
         shell: bash -l {0}

From ab8ab36452a0e4df70d80c7417d0228e610e6437 Mon Sep 17 00:00:00 2001
From: cshaley <6740446+cshaley@users.noreply.github.com>
Date: Thu, 16 Nov 2023 16:14:02 -0600
Subject: [PATCH 4/4] fix avro files

---
 uavro/tests/logical.avro   | Bin 19463 -> 19480 bytes
 uavro/tests/primitive.avro | Bin 36528 -> 36554 bytes
 uavro/tests/test_core.py   |   1 -
 uavro/tests/util.py        |   7 ++++---
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uavro/tests/logical.avro b/uavro/tests/logical.avro
index c35064ce35e1a6070191d6dd02fe4a01ba7802b3..8e5da69203ca257c185d5b8aafe2526f30ff67fd 100644
GIT binary patch
literal 19480
zcmeI(Jxjwt7{GB`tcc<!&Ly*UaS_2q2S*o0Q5>$9YdyKVkc(moSv!k^AHY?l;OHlC
zQU`HRaL}*d<YcajO338o@ZWlO$&>VGpWOW(vew?OjZTZhBx=dXS8_Z&FlJ`hwsKDe
zqCb{-p$L?Xg;d^R(^E$xh>dEwW4zg>m-gaef1+fR_^!tt?vC8BDsk<OR>rqQ&(3Ek
zHzt0antjJGQP_0@ChBS_%=%a8R2SDzi_6Xh+8AxUJfCg;#A^RFmQ12@EL9mxhiS!a
z`65-NTj^Au-tMK!Rs~Q}2g0}!TYOzNY4gSBxR^?9bribxLZ0vDBPWwfPmSx9<<;jw
zy1g}_PN&Y^YxlQ<yVuQ!%l_N>%SGeyxL(ibVkY=a@K+!ykPCS#@O)%hzygVNAuD7y
z25gboEV4&N3qTUM2qi<wP%@MZB}2(jGL#G@L&;Dwlnf<9$xt$s3?)O!P%@MZB}2(j
zGL#G@L&;Dwlnf<9$xt$s3?)O!P%@MZB}2(jGL#G@L&;FGdRBf*{i=S`B0rKJ$&chm
Z@*`CQst8mOs3K5Bpo;MCstDz!`v;nuqDKG#

literal 19463
zcmeI(u}Z^07{GBGEV#Idn@}>hS)BAGToe)MaJgLT$t5YdD3*{H=;ojgP-kDjXAp4^
zAE3JU0E!3!lOR@NCntyhn7iJW<Y>O!{XVkeAGem*#Ay<HG7gkniB61JuaB)fQlWTm
zXKo}y<!*P}J*yJ8+o_N3NXWWTor!Q{lvj<ZI@9r}Zcmhqlb~uDXk`Lh1~{CD5<h;L
zeUCA5G^{#IJk(N{-LFuo4wX&I)AT}ZjJ9r`cRTY~{$FFsByPr13uEahU2s`}NLAxf
z1`CJ#<5bzI$Cfu$P0r@;do1T(hr*Qc`uS4+R!n*`zh7)j3+F1@x?G)pv>q<rZ=d!b
zr!SN9*>(H=^}xw!VkY=c@F<WJ$c4NWct5f%V1dNCkQFi;1GY$P7TF`C1t1Argp#3T
zC>ctIlA&ZM8A^tdp=2l-N`{i5WGER*hLWLVC>ctIlA&ZM8A^tdp=2l-N`{i5WGER*
zhLWLVC>ctIlA&ZM8A^tdp=2nTlQq9mzj5w7@+0|?{78NzKT<`Yia-^CDgspmstEtC
JiqKrTe*$J&$Cv;B

diff --git a/uavro/tests/primitive.avro b/uavro/tests/primitive.avro
index bc198268e05701dfe2b93a5a49c7209b1bdf7e1b..4786a4780925c8bc8d187795a0beb9b1a53434ae 100644
GIT binary patch
delta 447
zcmdlmm+918CVT&+EJhZQ#ImA%z2y9q)MSpl(wrPIFuyoCBQ-bi16#FHUSe))aY15o
zs*;t0QfftFZb43}9!QPS<U&TtdXQ*nacYs0j)GEJW@=7KF;FBLq75XM2$CqNEC6dS
zE-A{)OINDZQ9vk2LROGeS&~|eDxZujpP5&JDw~pmES-~&Zh9)RbXrb+BAWg*Wcif*
z(xjYJR14C93MSrHmIwL*6cQjW0X=}?gAAaO$s&xtAfsSvGJtAgYZ+{BWv>;p$)EQ4
j!h{uzCO974T<tK^P5`T@2)gJU#t*ie8yqV5G1LP9L9&-1

delta 417
zcmX>#mubUXrh5OREJhZw#ImA%z2fAI)ZD~9Y}HC>nW;G`#Y$ER(bY;Nl?AClmQry^
zQD$Dcl8%B>UScj-BvGkWM**QAsj?)s7+F3ERX#JX1X(s2ESmr~KPMm6^b}OxX*v0c
zDEd=T<x}!YlX6m#El2|^m~73cECh5X+|}t2;aWyt0c7C}rP|nu_L3gO1&PUE-=$V0
z<`(3n>Vbj=+1SwH)FP!?5pakl=clA5bL5rg<S=;VzUh0F;L|7k)auV{A?BRTZy0CV
O2@ol2S6{=Ap%wsDwu&<V

diff --git a/uavro/tests/test_core.py b/uavro/tests/test_core.py
index 2c15073..cbc8eac 100644
--- a/uavro/tests/test_core.py
+++ b/uavro/tests/test_core.py
@@ -38,7 +38,6 @@ def test_primitive():
             assert out[k][0] == pdata[0][k]
 
 
-@pytest.mark.skip
 def test_logical():
     out = read(os.path.join(here, 'logical.avro'))
     assert len(out) == 1000
diff --git a/uavro/tests/util.py b/uavro/tests/util.py
index f007aa9..c793116 100644
--- a/uavro/tests/util.py
+++ b/uavro/tests/util.py
@@ -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:
@@ -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: