CLN: #1836 merge mypy_strict into mypy (#1866)

* merge mypy_strict into mypy

* ty

* py311

* py311 again

* mypy_dist

Author: cmp0xff

.github/workflows/comment_commands.yml

@@ -16,7 +16,7 @@ jobs:
       actions: write
       checks: write
     # if more commands are added, they will need to be added here too as we don't have access to env at this stage
-    if: (github.event.issue.pull_request) && contains(fromJSON('["/pandas_nightly", "/mypy_nightly", "/mypy_strict", "/pyrefly_strict", "/pyrefly_all", "/ty_all"]'), github.event.comment.body) && github.event.comment.author_association == 'MEMBER'
+    if: (github.event.issue.pull_request) && contains(fromJSON('["/pandas_nightly", "/mypy_nightly", "/pyrefly_strict", "/pyrefly_all", "/ty_all"]'), github.event.comment.body) && github.event.comment.author_association == 'MEMBER'
 
     steps:
       - name: Resolve comment command
@@ -34,10 +34,6 @@ jobs:
               echo "poe_command=mypy --mypy_nightly" >> "${GITHUB_OUTPUT}"
               echo "check_name=Mypy nightly tests" >> "${GITHUB_OUTPUT}"
               ;;
-            /mypy_strict)
-              echo "poe_command=mypy_strict" >> "${GITHUB_OUTPUT}"
-              echo "check_name=Mypy strict tests" >> "${GITHUB_OUTPUT}"
-              ;;
             /pyrefly_strict)
               echo "poe_command=pyrefly_strict" >> "${GITHUB_OUTPUT}"
               echo "check_name=Pyrefly tests strict preset" >> "${GITHUB_OUTPUT}"

.github/workflows/optional.yml

@@ -25,7 +25,7 @@ jobs:
       uses: ./.github/setup
       with:
         os: ubuntu-latest
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Run pytest (against pandas nightly)
       run: poetry run poe pytest --nightly
@@ -46,33 +46,11 @@ jobs:
       uses: ./.github/setup
       with:
         os: ubuntu-latest
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Run mypy tests with mypy nightly
       run: poetry run poe mypy --mypy_nightly
 
-
-  mypy_strict:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: read
-      actions: write
-
-    steps:
-    - uses: actions/checkout@v7
-      with:
-        persist-credentials: false
-
-    - name: Install project dependencies
-      uses: ./.github/setup
-      with:
-        os: ubuntu-latest
-        python-version: '3.11'
-
-    - name: Run mypy tests with all optional errors enabled
-      run: poetry run poe mypy_strict
-
   pyrefly_strict:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -84,7 +62,7 @@ jobs:
       uses: ./.github/setup
       with:
         os: ubuntu-latest
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Run pyrefly tests with preset 'strict'
       run: poetry run poe pyrefly_strict
@@ -100,7 +78,7 @@ jobs:
       uses: ./.github/setup
       with:
         os: ubuntu-latest
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Run pyrefly tests with preset 'all'
       run: poetry run poe pyrefly_all
@@ -116,7 +94,7 @@ jobs:
       uses: ./.github/setup
       with:
         os: ubuntu-latest
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Run ty tests with all rules raising errors
       run: poetry run poe ty_all

docs/tests.md

@@ -21,7 +21,6 @@ The following tests are **optional**. Some of them are run by the CI but it is o
 
 - Run pytest against pandas nightly: `poe pytest --nightly`
 - Use mypy nightly to validate the annotations: `poe mypy --mypy_nightly`
-- Use mypy with [all optional errors enabled](https://mypy.readthedocs.io/en/stable/config_file.html#confval-strict): `poe mypy_strict`
 - Use pyrefly with [preset](https://pyrefly.org/en/docs/configuration/#preset) 'strict': `poe pyrefly_strict`
 - Use pyrefly with preset 'all': `poe pyrefly_all`
 - Use ty with [all rules raising errors](https://docs.astral.sh/ty/rules/#rule-levels): `poe ty_all`
@@ -31,7 +30,6 @@ Among the tests above, the following can be run directly during a PR by commenti
 
 - Run pytest against pandas nightly by commenting `/pandas_nightly`
 - Use mypy nightly to validate the annotations by commenting `/mypy_nightly`
-- Use mypy with all optional errors enabled: `/mypy_strict`
 - Use pyrefly with preset 'strict': `/pyrefly_strict`
 - Use pyrefly with preset 'all': `/pyrefly_all`
 - Use ty with all rules raising errors: `/ty_all`

pyproject.toml

@@ -150,10 +150,6 @@ script = "scripts.test:mypy_src(mypy_nightly)"
 help = "Run mypy on 'tests' using the installed stubs"
 script = "scripts.test:run_tests(dist=True, type_checker='mypy')"
 
-[tool.poe.tasks.mypy_strict]
-help = "Run mypy on 'tests' (using the local stubs) and on the local stubs with all optional errors enabled"
-script = "scripts.test.run:mypy_src_strict"
-
 [tool.poe.tasks.stubtest]
 script = "scripts.test:stubtest(allowlist, check_missing, nightly)"
 help = "Run stubtest to compare the installed stubs against pandas"
@@ -362,6 +358,7 @@ python-platform = "all"
 
 [tool.ty.rules]
 possibly-unresolved-reference = "error"
+missing-type-argument = "error"
 
 [tool.ty.analysis]
 respect-type-ignore-comments = false

scripts/test/_step.py

@@ -29,10 +29,6 @@
     name="Run mypy on 'tests' (using the local stubs) and on the local stubs",
     run=run.mypy_src,
 )
-mypy_src_strict = Step(
-    name="Run mypy on 'tests' (using the local stubs) and on the local stubs with all optional errors enabled",
-    run=run.mypy_src_strict,
-)
 pytest = Step(name="Run pytest", run=run.pytest)
 style = Step(name="Run pre-commit", run=run.style)
 build_dist = Step(name="Build pandas-stubs", run=run.build_dist)

scripts/test/run.py

@@ -7,11 +7,6 @@
 
 
 def mypy_src() -> None:
-    cmd = ["mypy", "pandas-stubs", "tests", "--no-incremental"]
-    subprocess.run(cmd, check=True)
-
-
-def mypy_src_strict() -> None:
     cmd = ["mypy", "pandas-stubs", "tests", "--no-incremental", "--strict"]
     subprocess.run(cmd, check=True)
 
@@ -77,7 +72,7 @@ def rename_src() -> None:
 
 
 def mypy_dist() -> None:
-    cmd = ["mypy", "tests", "--no-incremental"]
+    cmd = ["mypy", "tests", "--no-incremental", "--strict"]
     subprocess.run(cmd, check=True)
 
 

tests/extension/decimal/array.py

@@ -235,7 +235,9 @@ def astype(self, dtype: ExtensionDtype, copy: bool = True) -> ExtensionArray: ..
     @overload
     def astype(self, dtype: AstypeArg, copy: bool = True) -> ArrayLike: ...
 
-    def astype(self, dtype: Dtype, copy: bool = True):
+    def astype(
+        self, dtype: Dtype, copy: bool = True
+    ) -> np_1darray | ExtensionArray | ArrayLike:
         if is_dtype_equal(dtype, self._dtype):
             if not copy:
                 return self
@@ -323,7 +325,7 @@ def convert_values(param: Any) -> ExtensionArray | list[Any]:
             else:
                 # Assume it's an object
                 ovalues = [param] * len(self)
-            return ovalues
+            return ovalues  # type: ignore[no-any-return]
 
         lvalues = self
         rvalues = convert_values(other)

tests/frame/test_frame.py

@@ -82,7 +82,7 @@ def getCols(k: int) -> str:
 
 
 def makeStringIndex(k: int = 10) -> pd.Index:
-    return pd.Index(rands_array(nchars=10, size=k), name=None)
+    return pd.Index(rands_array(nchars=10, size=k), name=None)  # type: ignore[no-any-return]
 
 
 def rands_array(nchars: int, size: int) -> np_ndarray:

tests/frame/test_groupby.py

@@ -294,7 +294,7 @@ def test_types_groupby_agg() -> None:
     check(assert_type(df.groupby("col1").agg(agg_dict1), pd.DataFrame), pd.DataFrame)
 
     def wrapped_min(x: pd.Series) -> Scalar:
-        return x.min()
+        return x.min()  # type: ignore[no-any-return]
 
     # TODO: https://github.com/facebook/pyrefly/issues/3891
     check(

tests/series/test_properties.py

@@ -1,4 +1,6 @@
+# mypy: disable-error-code=type-arg
 # pyright: reportMissingTypeArgument=false
+# ty: ignore[missing-type-argument]
 from typing import (
     TYPE_CHECKING,
     assert_type,