From 2e64ecf739619c984e62730d613d46f441555dd9 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Wed, 6 Nov 2019 11:07:33 -0500
Subject: [PATCH 1/3] DEV: Cleanup dev environment

* Switch to conda-forge only
* Remove unused pytest-mock
* Pin to 3.7 until the buildout is done
---
 environment.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 443dc483aedf8..a3b31c8990e2d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,11 +1,10 @@
 name: pandas-dev
 channels:
-  - defaults
   - conda-forge
 dependencies:
   # required
   - numpy>=1.15
-  - python=3
+  - python=3.7
   - python-dateutil>=2.6.1
   - pytz
 
@@ -54,7 +53,6 @@ dependencies:
   - moto  # mock S3
   - pytest>=4.0.2
   - pytest-cov
-  - pytest-mock
   - pytest-xdist
   - seaborn
   - statsmodels

From 8dc2d461863599a9cb176ff86b7057d66e1a0834 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Wed, 6 Nov 2019 11:41:57 -0500
Subject: [PATCH 2/3] gen deps

---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7a378cd2f2697..5c2dfd45c891a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,5 @@
 numpy>=1.15
+python==3.7
 python-dateutil>=2.6.1
 pytz
 asv
@@ -32,7 +33,6 @@ hypothesis>=3.82
 moto
 pytest>=4.0.2
 pytest-cov
-pytest-mock
 pytest-xdist
 seaborn
 statsmodels

From e936d567e4e6f4a844c55a2686ce546c3be59027 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Wed, 6 Nov 2019 13:08:02 -0500
Subject: [PATCH 3/3] pin mypy

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

diff --git a/environment.yml b/environment.yml
index a3b31c8990e2d..e9ac76f5bc52c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -21,7 +21,7 @@ dependencies:
   - flake8-comprehensions  # used by flake8, linting of unnecessary comprehensions
   - flake8-rst>=0.6.0,<=0.7.0  # linting of code blocks in rst files
   - isort  # check that imports are in the right order
-  - mypy
+  - mypy=0.720
   - pycodestyle  # used by flake8
 
   # documentation
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 5c2dfd45c891a..e7df704925485 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,7 +10,7 @@ flake8
 flake8-comprehensions
 flake8-rst>=0.6.0,<=0.7.0
 isort
-mypy
+mypy==0.720
 pycodestyle
 gitpython
 sphinx