undo hacks

python · Jul 2, 2023 · e5cfb30 · e5cfb30
1 parent f488592
commit e5cfb30
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
           arch: x64
           os: windows-latest
           toxenv: py38
-          # tox_extra_args: "-n 2"
+          tox_extra_args: "-n 2"
         - name: Test suite with py39-ubuntu
           python: '3.9'
           arch: x64

diff --git a/mypy/test/data.py b/mypy/test/data.py
@@ -369,11 +369,7 @@ def teardown(self) -> None:
             os.chdir(self.old_cwd)
         if self.tmpdir is not None:
             try:
-                # We run into a RecursionError on Windows
-                # https://github.com/python/cpython/issues/79325
-                # So just avoid cleaning up the temporary directory on CI
-                if sys.platform != "win32" or "GITHUB_ACTION" not in os.environ:
-                    self.tmpdir.cleanup()
+                self.tmpdir.cleanup()
             except OSError:
                 pass
         self.old_cwd = None

diff --git a/mypy/test/teststubgen.py b/mypy/test/teststubgen.py
@@ -719,12 +719,7 @@ def run_case_inner(self, testcase: DataDrivenTestCase) -> None:
             for mod in mods:
                 if mod in sys.modules:
                     del sys.modules[mod]
-
-            # We run into a RecursionError on Windows
-            # https://github.com/python/cpython/issues/79325
-            # So just avoid cleaning up the temporary directory on CI
-            if sys.platform != "win32" or "GITHUB_ACTION" not in os.environ:
-                shutil.rmtree(out_dir)
+            shutil.rmtree(out_dir)
 
     def parse_flags(self, program_text: str, extra: list[str]) -> Options:
         flags = re.search("# flags: (.*)$", program_text, flags=re.MULTILINE)