diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 7bd271928..d045d35bb 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -19,7 +19,7 @@ jobs: upstream-dev: name: upstream-dev runs-on: ubuntu-latest - if: ${{ contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} + if: ${{ (contains(github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' }} defaults: run: shell: bash -l {0} diff --git a/flox/xrdtypes.py b/flox/xrdtypes.py index bf372f571..99dd08eb7 100644 --- a/flox/xrdtypes.py +++ b/flox/xrdtypes.py @@ -31,17 +31,6 @@ def __eq__(self, other): NINF = AlwaysLessThan() -# Pairs of types that, if both found, should be promoted to object dtype -# instead of following NumPy's own type-promotion rules. These type promotion -# rules match pandas instead. For reference, see the NumPy type hierarchy: -# https://docs.scipy.org/doc/numpy-1.13.0/reference/arrays.scalars.html -PROMOTE_TO_OBJECT = [ - {np.number, np.character}, # numpy promotes to character - {np.bool_, np.character}, # numpy promotes to character - {np.bytes_, np.unicode_}, # numpy promotes to unicode -] - - def maybe_promote(dtype): """Simpler equivalent of pandas.core.common._maybe_promote