Merge remote-tracking branch 'upstream/main' into pandas2-removals-in…

…dexes
pandas-dev · May 29, 2024 · d14b4fe · d14b4fe
2 parents 399dbb7 + 2602494
commit d14b4fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pandas-stubs/core/groupby/generic.pyi b/pandas-stubs/core/groupby/generic.pyi
@@ -207,7 +207,7 @@ class DataFrameGroupBy(GroupBy[DataFrame], Generic[ByT]):
     ) -> DataFrame: ...
     # error: overload 1 overlaps overload 2 because of different return types
     @overload
-    def aggregate(self, func: Literal["size"]) -> Series: ...  # type: ignore[overload-overlap]  # pyright: ignore[reportOverlappingOverload]
+    def aggregate(self, func: Literal["size"]) -> Series: ...  # type: ignore[overload-overlap]
     @overload
     def aggregate(
         self,

diff --git a/pyproject.toml b/pyproject.toml
@@ -39,11 +39,11 @@ mypy = "1.10.0"
 pandas = "2.2.2"
 pyarrow = ">=10.0.1"
 pytest = ">=7.1.2"
-pyright = ">=1.1.362"
+pyright = ">=1.1.365"
 poethepoet = ">=0.16.5"
 loguru = ">=0.6.0"
 typing-extensions = ">=4.4.0"
-matplotlib = ">=3.5.1"
+matplotlib = ">=3.5.1,<3.9.0"  # TODO https://github.com/pandas-dev/pandas/issues/58851
 pre-commit = ">=2.19.0"
 black = ">=23.3.0"
 isort = ">=5.12.0"