diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index c18eb162f..9521b7b68 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -22,12 +22,13 @@ jobs: fetch-depth: 0 - name: Set up conda environment - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci/environment.yml environment-name: flox-tests - cache-env: true - # extra-specs: | + init-shell: bash + cache-environment: true + # create-args: | # python="${{ matrix.python-version }}" # - name: Setup some dependencies diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 38fba5d88..9449d9290 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -53,14 +53,15 @@ jobs: echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV - name: Setup micromamba - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ${{env.CONDA_ENV_FILE}} environment-name: flox-tests - extra-specs: | - python=${{env.PYTHON_VERSION}} - cache-env: true + init-shell: bash + cache-environment: true cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + create-args: | + python=${{ env.PYTHON_VERSION }} - name: Install flox run: | @@ -102,14 +103,15 @@ jobs: run: | echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV - name: Setup micromamba - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ${{env.CONDA_ENV_FILE}} environment-name: flox-tests - extra-specs: | - python=${{env.PYTHON_VERSION}} - cache-env: true + init-shell: bash + cache-environment: true cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + create-args: | + python=${{ env.PYTHON_VERSION }} - name: Install flox run: | python -m pip install --no-deps -e . diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2d65e9d1d..75aafc4b6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,13 +34,14 @@ jobs: run: | echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV - name: Set up conda environment - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci/environment.yml environment-name: flox-tests - cache-env: true - extra-specs: | - python="${{ matrix.python-version }}" + init-shell: bash + cache-environment: true + create-args: | + python=${{ matrix.python-version }} - name: Install flox run: | python -m pip install --no-deps -e . @@ -77,13 +78,14 @@ jobs: with: fetch-depth: 0 # Fetch all history for all branches and tags. - name: Set up conda environment - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: - environment-file: ci/${{ matrix.env }}.yml + environment-file: ci/environment.yml environment-name: flox-tests - cache-env: true - extra-specs: | - python="${{ matrix.python-version }}" + init-shell: bash + cache-environment: true + create-args: | + python=${{ matrix.python-version }} - name: Install flox run: | python -m pip install --no-deps -e . @@ -111,13 +113,14 @@ jobs: repository: 'pydata/xarray' fetch-depth: 0 # Fetch all history for all branches and tags. - name: Set up conda environment - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci/requirements/environment.yml environment-name: xarray-tests - cache-env: true - extra-specs: | - python="3.10" + init-shell: bash + cache-environment: true + create-args: | + python=3.10 - name: Install xarray run: | python -m pip install --no-deps . diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 7bd271928..62645707e 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -35,12 +35,14 @@ jobs: run: | echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV - name: Set up conda environment - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci/upstream-dev-env.yml environment-name: flox-tests - extra-specs: | - python="${{ matrix.python-version }}" + init-shell: bash + cache-environment: true + create-args: >- + python=${{ matrix.python-version }} pytest-reportlog - name: Install flox run: | diff --git a/flox/core.py b/flox/core.py index f821df9bc..f8f700f99 100644 --- a/flox/core.py +++ b/flox/core.py @@ -1622,7 +1622,7 @@ def _convert_expected_groups_to_index( out.append(ex) elif ex is not None: if isbin_: - out.append(pd.IntervalIndex.from_breaks(ex)) # type: ignore [arg-type] # TODO: what do we want here? + out.append(pd.IntervalIndex.from_breaks(ex)) else: if sort: ex = np.sort(ex)