Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into add-xxhash32
Browse files Browse the repository at this point in the history
  • Loading branch information
PointKernel authored Dec 30, 2024
2 parents 538a416 + 45b40c5 commit 1f79ad0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies:
- ptxcompiler
- pyarrow>=14.0.0,<19.0.0a0
- pydata-sphinx-theme!=0.14.2
- pynvml>=11.4.1,<12.0.0a0
- pynvml>=12.0.0,<13.0.0a0
- pytest-benchmark
- pytest-cases>=3.8.2
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies:
- pyarrow>=14.0.0,<19.0.0a0
- pydata-sphinx-theme!=0.14.2
- pynvjitlink>=0.0.0a0
- pynvml>=11.4.1,<12.0.0a0
- pynvml>=12.0.0,<13.0.0a0
- pytest-benchmark
- pytest-cases>=3.8.2
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/dask-cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ requirements:
run:
- python
- cudf ={{ version }}
- pynvml >=11.4.1,<12.0.0a0
- pynvml >=12.0.0,<13.0.0a0
- rapids-dask-dependency ={{ minor_version }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}

Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- pynvml>=11.4.1,<12.0.0a0
- pynvml>=12.0.0,<13.0.0a0
- rapids-dask-dependency==25.2.*,>=0.0.0a0
run_custreamz:
common:
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/core/groupby/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ def get_group(self, name, obj=None):
"instead of ``gb.get_group(name, obj=df)``.",
FutureWarning,
)
if is_list_like(self._by):
if is_list_like(self._by) and len(self._by) == 1:
if isinstance(name, tuple) and len(name) == 1:
name = name[0]
else:
Expand Down
7 changes: 7 additions & 0 deletions python/cudf/cudf/tests/test_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -4076,6 +4076,13 @@ def test_get_group_list_like():
df.groupby(["a"]).get_group([1])


def test_get_group_list_like_len_2():
df = cudf.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6], "c": [3, 2, 1]})
result = df.groupby(["a", "b"]).get_group((1, 4))
expected = df.to_pandas().groupby(["a", "b"]).get_group((1, 4))
assert_eq(result, expected)


def test_size_as_index_false():
df = pd.DataFrame({"a": [1, 2, 1], "b": [1, 2, 3]}, columns=["a", "b"])
expected = df.groupby("a", as_index=False).size()
Expand Down
2 changes: 1 addition & 1 deletion python/dask_cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"fsspec>=0.6.0",
"numpy>=1.23,<3.0a0",
"pandas>=2.0,<2.2.4dev0",
"pynvml>=11.4.1,<12.0.0a0",
"pynvml>=12.0.0,<13.0.0a0",
"rapids-dask-dependency==25.2.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down

0 comments on commit 1f79ad0

Please sign in to comment.