From 0cb75c17c1a6b11d945aef7ac62f909303b166b8 Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Tue, 23 Feb 2021 15:06:14 +0000
Subject: [PATCH 1/2] remove numpy pin from environment.yml on 1.2.x

---
 environment.yml      | 2 +-
 requirements-dev.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index ac696b95f6ba9..bc5bfcd162500 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   # required
-  - numpy>=1.16.5, <1.20 # gh-39513
+  - numpy>=1.16.5
   - python=3
   - python-dateutil>=2.7.3
   - pytz
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 92a98fbb0547c..98a149eb5d412 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 # This file is auto-generated from environment.yml, do not modify.
 # See that file for comments about the need/usage of each dependency.
 
-numpy>=1.16.5, <1.20
+numpy>=1.16.5
 python-dateutil>=2.7.3
 pytz
 asv

From fb0dc9d1f545d1147a0ac1f9cef8117cb881d04b Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Tue, 23 Feb 2021 15:45:29 +0000
Subject: [PATCH 2/2] no_site_packages = True

---
 pandas/tests/arrays/string_/test_string.py | 7 +------
 pandas/tests/window/conftest.py            | 6 ++----
 setup.cfg                                  | 1 +
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py
index c70d55b07661d..b6d49e48dbdf0 100644
--- a/pandas/tests/arrays/string_/test_string.py
+++ b/pandas/tests/arrays/string_/test_string.py
@@ -14,13 +14,8 @@
 
 @pytest.fixture(
     params=[
-        # pandas\tests\arrays\string_\test_string.py:16: error: List item 1 has
-        # incompatible type "ParameterSet"; expected
-        # "Sequence[Collection[object]]"  [list-item]
         "string",
-        pytest.param(
-            "arrow_string", marks=skip_if_no_pyarrow
-        ),  # type:ignore[list-item]
+        pytest.param("arrow_string", marks=skip_if_no_pyarrow),
     ]
 )
 def dtype(request):
diff --git a/pandas/tests/window/conftest.py b/pandas/tests/window/conftest.py
index a765f268cfb07..236aa05444ec8 100644
--- a/pandas/tests/window/conftest.py
+++ b/pandas/tests/window/conftest.py
@@ -100,9 +100,7 @@ def ignore_na(request):
 
 @pytest.fixture(
     params=[
-        pytest.param(
-            "numba", marks=td.skip_if_no("numba", "0.46.0")
-        ),  # type: ignore[list-item]
+        pytest.param("numba", marks=td.skip_if_no("numba", "0.46.0")),
         "cython",
     ]
 )
@@ -318,7 +316,7 @@ def halflife_with_times(request):
         "float64",
         "m8[ns]",
         "M8[ns]",
-        pytest.param(  # type: ignore[list-item]
+        pytest.param(
             "datetime64[ns, UTC]",
             marks=pytest.mark.skip(
                 "direct creation of extension dtype datetime64[ns, UTC] "
diff --git a/setup.cfg b/setup.cfg
index 244e6f18bb0ef..03fbb46799a14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -122,6 +122,7 @@ strict_equality = True
 warn_redundant_casts = True
 warn_unused_ignores = True
 show_error_codes = True
+no_site_packages = True
 
 [mypy-pandas.tests.*]
 check_untyped_defs=False