fix: update backport for changes in Numba, NumExpr, Arrow, and RDataF…

…rame (#2735) * fix: backport numba old to new style error capturing to avoid warnings * backporting #2617 * backporting #2670 and tests that depend on Parquet list separator * style: pre-commit fixes * backporting #2617 for the _v2 subdirectory * RDataFrame handling is broken in _v2 subdirectory; don't bother fixing because it's correct in the real Awkward 2.x * The next awkward 1.x backport will be version 1.10.5. * Windows can't build ('x86' vs 'x86_64'). Maybe use the old VM? * No, change that back. * Remove all v2 tests. * I was changing the wrong workflow file. Let's try new Windows. * What I really need to test is the wheel-building. * Try again. * On second thought, don't upload to PyPI. * Remove 32-bit Windows from build-test.yml and modernize wheels.yml. --------- Co-authored-by: Jim Pivarski <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
scikit-hep · Oct 4, 2023 · cf8f373 · cf8f373
1 parent e68a046
commit cf8f373
Show file tree

Hide file tree

Showing 231 changed files with 145 additions and 68,438 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -40,10 +40,6 @@ jobs:
         python-architecture:
           - x64
 
-        include:
-          - python-version: '3.9'
-            python-architecture: x86
-
     runs-on: windows-2019
 
     env:

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -93,12 +93,13 @@ jobs:
     needs: [build_wheels, build_alt_wheels, make_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
+    permissions:
+      id-token: write
+    environment:
+      name: "deploy-pypi"
     steps:
     - uses: actions/download-artifact@v3
       with:
         name: artifact
         path: dist
-
-    - uses: pypa/[email protected]
-      with:
-        password: ${{ secrets.pypi_password }}
+    - uses: pypa/[email protected]
diff --git a/VERSION_INFO b/VERSION_INFO
@@ -1 +1 @@
-1.10.4
+1.10.5
diff --git a/src/awkward/_connect/_numba/arrayview.py b/src/awkward/_connect/_numba/arrayview.py
@@ -7,6 +7,7 @@
 import numba
 import numba.core.typing
 import numba.core.typing.ctypes_utils
+from numba.core.errors import NumbaTypeError
 
 import awkward as ak
 
@@ -586,7 +587,7 @@ def generic(self, args, kwargs):
                     viewtype, wheretype
                 )
             else:
-                raise TypeError(
+                raise NumbaTypeError(
                     "only an integer, start:stop range, or a *constant* "
                     "field name string may be used as ak.Array "
                     "slices in compiled code" + ak._util.exception_suffix(__file__)
@@ -874,7 +875,7 @@ def generic(self, args, kwargs):
                     recordviewtype, wheretype.literal_value
                 )(recordviewtype, wheretype)
             else:
-                raise TypeError(
+                raise NumbaTypeError(
                     "only a *constant* field name string may be used as "
                     "ak.Record slices in compiled code"
                     + ak._util.exception_suffix(__file__)
@@ -1504,7 +1505,7 @@ def generic(self, args, kwargs):
                 return rettype(partviewtype, wheretype)
 
             else:
-                raise TypeError(
+                raise NumbaTypeError(
                     "only an integer, start:stop range, or a *constant* "
                     "field name string may be used as ak.Array "
                     "slices in compiled code" + ak._util.exception_suffix(__file__)

diff --git a/src/awkward/_connect/_numba/builder.py b/src/awkward/_connect/_numba/builder.py
@@ -5,6 +5,7 @@
 import numba
 import numba.core.typing
 import numba.core.typing.ctypes_utils
+from numba.core.errors import NumbaTypeError
 
 import awkward as ak
 
@@ -145,7 +146,7 @@ def resolve_clear(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.clear"
                 + ak._util.exception_suffix(__file__)
             )
@@ -155,7 +156,7 @@ def resolve_null(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.null"
                 + ak._util.exception_suffix(__file__)
             )
@@ -169,7 +170,7 @@ def resolve_boolean(self, arraybuildertype, args, kwargs):
         ):
             return numba.types.none(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.boolean"
                 + ak._util.exception_suffix(__file__)
             )
@@ -183,7 +184,7 @@ def resolve_integer(self, arraybuildertype, args, kwargs):
         ):
             return numba.types.none(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.integer"
                 + ak._util.exception_suffix(__file__)
             )
@@ -197,7 +198,7 @@ def resolve_real(self, arraybuildertype, args, kwargs):
         ):
             return numba.types.none(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.real"
                 + ak._util.exception_suffix(__file__)
             )
@@ -207,7 +208,7 @@ def resolve_begin_list(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.begin_list"
                 + ak._util.exception_suffix(__file__)
             )
@@ -217,7 +218,7 @@ def resolve_end_list(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.end_list"
                 + ak._util.exception_suffix(__file__)
             )
@@ -231,7 +232,7 @@ def resolve_begin_tuple(self, arraybuildertype, args, kwargs):
         ):
             return numba.types.none(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.begin_tuple"
                 + ak._util.exception_suffix(__file__)
             )
@@ -245,7 +246,7 @@ def resolve_index(self, arraybuildertype, args, kwargs):
         ):
             return arraybuildertype(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.index"
                 + ak._util.exception_suffix(__file__)
             )
@@ -255,7 +256,7 @@ def resolve_end_tuple(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.end_tuple"
                 + ak._util.exception_suffix(__file__)
             )
@@ -271,7 +272,7 @@ def resolve_begin_record(self, arraybuildertype, args, kwargs):
         ):
             return numba.types.none(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.begin_record"
                 + ak._util.exception_suffix(__file__)
             )
@@ -285,7 +286,7 @@ def resolve_field(self, arraybuildertype, args, kwargs):
         ):
             return arraybuildertype(args[0])
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number or types of arguments for ArrayBuilder.field"
                 + ak._util.exception_suffix(__file__)
             )
@@ -295,7 +296,7 @@ def resolve_end_record(self, arraybuildertype, args, kwargs):
         if len(args) == 0 and len(kwargs) == 0:
             return numba.types.none()
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 "wrong number of arguments for ArrayBuilder.end_record"
                 + ak._util.exception_suffix(__file__)
             )

diff --git a/src/awkward/_connect/_numba/layout.py b/src/awkward/_connect/_numba/layout.py
@@ -8,6 +8,7 @@
 import numba
 
 import awkward as ak
+from numba.core.errors import NumbaTypeError, NumbaValueError
 
 np = ak.nplike.NumpyMetadata.instance()
 numpy = ak.nplike.Numpy.instance()
@@ -41,7 +42,7 @@
 @numba.extending.typeof_impl.register(ak.layout.Index64)
 @numba.extending.typeof_impl.register(ak.layout.Record)
 def fake_typeof(obj, c):
-    raise TypeError(
+    raise NumbaTypeError(
         "{} objects cannot be passed directly into Numba-compiled functions; "
         "construct a high-level ak.Array or ak.Record instead".format(
             type(obj).__name__
@@ -334,7 +335,7 @@ def getitem_field(self, viewtype, key):
                 self, viewtype, viewtype.fields + (key,)
             )
         else:
-            raise TypeError(
+            raise NumbaTypeError(
                 f"array does not have a field with key {key!r}"
                 + ak._util.exception_suffix(__file__)
             )
@@ -2018,14 +2019,14 @@ def getitem_at(self, viewtype):
             index = self.fieldindex(key)
             if index is None:
                 if self.recordlookup is None:
-                    raise ValueError(
+                    raise NumbaValueError(
                         "no field {} in tuples with {} fields".format(
                             repr(key), len(self.contenttypes)
                         )
                         + ak._util.exception_suffix(__file__)
                     )
                 else:
-                    raise ValueError(
+                    raise NumbaValueError(
                         "no field {} in records with "
                         "fields: [{}]".format(
                             repr(key), ", ".join(repr(x) for x in self.recordlookup)
@@ -2042,14 +2043,14 @@ def getitem_field(self, viewtype, key):
         index = self.fieldindex(key)
         if index is None:
             if self.recordlookup is None:
-                raise ValueError(
+                raise NumbaValueError(
                     "no field {} in tuples with {} fields".format(
                         repr(key), len(self.contenttypes)
                     )
                     + ak._util.exception_suffix(__file__)
                 )
             else:
-                raise ValueError(
+                raise NumbaValueError(
                     "no field {} in records with fields: [{}]".format(
                         repr(key), ", ".join(repr(x) for x in self.recordlookup)
                     )
@@ -2063,14 +2064,14 @@ def getitem_field_record(self, recordviewtype, key):
         index = self.fieldindex(key)
         if index is None:
             if self.recordlookup is None:
-                raise ValueError(
+                raise NumbaValueError(
                     "no field {} in tuple with {} fields".format(
                         repr(key), len(self.contenttypes)
                     )
                     + ak._util.exception_suffix(__file__)
                 )
             else:
-                raise ValueError(
+                raise NumbaValueError(
                     "no field {} in record with fields: [{}]".format(
                         repr(key), ", ".join(repr(x) for x in self.recordlookup)
                     )
@@ -2391,21 +2392,21 @@ def hasfield(self, key):
 
     def getitem_at(self, viewtype):
         if not all(isinstance(x, RecordArrayType) for x in self.contenttypes):
-            raise TypeError(
+            raise NumbaTypeError(
                 "union types cannot be accessed in Numba"
                 + ak._util.exception_suffix(__file__)
             )
 
     def getitem_range(self, viewtype):
         if not all(isinstance(x, RecordArrayType) for x in self.contenttypes):
-            raise TypeError(
+            raise NumbaTypeError(
                 "union types cannot be accessed in Numba"
                 + ak._util.exception_suffix(__file__)
             )
 
     def getitem_field(self, viewtype, key):
         if not all(isinstance(x, RecordArrayType) for x in self.contenttypes):
-            raise TypeError(
+            raise NumbaTypeError(
                 "union types cannot be accessed in Numba"
                 + ak._util.exception_suffix(__file__)
             )
@@ -2605,7 +2606,7 @@ def getitem_at(form):
                 elif form.primitive == "bool":
                     return numba.boolean
                 else:
-                    raise ValueError(
+                    raise NumbaValueError(
                         "unrecognized NumpyForm.primitive type: {}".format(
                             form.primitive
                         )
@@ -2641,7 +2642,7 @@ def getitem_at(form):
                 return arrayview.type.getitem_at(arrayview)
 
             elif isinstance(form, ak.forms.UnionForm):
-                raise TypeError(
+                raise NumbaTypeError(
                     "union types cannot be accessed in Numba"
                     + ak._util.exception_suffix(__file__)
                 )

diff --git a/src/awkward/_connect/_numexpr.py b/src/awkward/_connect/_numexpr.py
@@ -71,7 +71,7 @@ def evaluate(
 ):
     numexpr = import_numexpr()
 
-    context = numexpr.necompiler.getContext(kwargs, frame_depth=1)
+    context = numexpr.necompiler.getContext(kwargs)
     expr_key = (expression, tuple(sorted(context.items())))
     if expr_key not in numexpr.necompiler._names_cache:
         numexpr.necompiler._names_cache[expr_key] = numexpr.necompiler.getExprNames(

diff --git a/src/awkward/_v2/_connect/numexpr.py b/src/awkward/_v2/_connect/numexpr.py
@@ -72,7 +72,7 @@ def evaluate(
 ):
     numexpr = import_numexpr()
 
-    context = numexpr.necompiler.getContext(kwargs, frame_depth=1)
+    context = numexpr.necompiler.getContext(kwargs)
     expr_key = (expression, tuple(sorted(context.items())))
     if expr_key not in numexpr.necompiler._names_cache:
         numexpr.necompiler._names_cache[expr_key] = numexpr.necompiler.getExprNames(