Skip to content

CI: Fix code-checks.yml name #47309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mroeschke merged 2 commits into from
Jun 11, 2022
Merged

CI: Fix code-checks.yml name #47309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb1a5d
CI: Fix code-checks.yml name
mroeschke Jun 11, 2022
748ce8e
Fix typing
mroeschke Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pandas/core/reshape/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down