Skip to content

Commit c5610d2

Browse files
authored
CI: Fix code-checks.yml name (#47309)
* CI: Fix code-checks.yml name * Fix typing
1 parent 57f5c51 commit c5610d2

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/code-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
path: ~/conda_pkgs_dir
5959
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
6060

61-
- Name: Set up Conda
61+
- name: Set up Conda
6262
uses: ./.github/actions/setup-conda
6363

6464
- name: Build Pandas

pandas/core/reshape/merge.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,7 @@ def _groupby_and_merge(by, left: DataFrame, right: DataFrame, merge_pieces):
162162
lcols = lhs.columns.tolist()
163163
cols = lcols + [r for r in right.columns if r not in set(lcols)]
164164
merged = lhs.reindex(columns=cols)
165-
# error: Incompatible types in assignment (expression has type
166-
# "range", variable has type "Index")
167-
merged.index = range(len(merged)) # type: ignore[assignment]
165+
merged.index = range(len(merged))
168166
pieces.append(merged)
169167
continue
170168

0 commit comments

Comments
 (0)