diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 85d8bedb95708..96088547634c5 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -58,7 +58,7 @@ jobs: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }} - - Name: Set up Conda + - name: Set up Conda uses: ./.github/actions/setup-conda - name: Build Pandas diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py index 5f108c26d239a..4227d43c459d0 100644 --- a/pandas/core/reshape/merge.py +++ b/pandas/core/reshape/merge.py @@ -162,9 +162,7 @@ def _groupby_and_merge(by, left: DataFrame, right: DataFrame, merge_pieces): lcols = lhs.columns.tolist() cols = lcols + [r for r in right.columns if r not in set(lcols)] merged = lhs.reindex(columns=cols) - # error: Incompatible types in assignment (expression has type - # "range", variable has type "Index") - merged.index = range(len(merged)) # type: ignore[assignment] + merged.index = range(len(merged)) pieces.append(merged) continue