From d2a53e9eda2c84c7c3d494ba4f87e5ce35e8e2fb Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Fri, 8 Mar 2019 16:04:12 -0800
Subject: [PATCH 1/2] TST: Update Conda CI build to use nightly pandas
 packages.

Remove unused git-based pip requirements file.
---
 .circleci/config.yml                                        | 6 +++---
 ci/requirements-3.6-MASTER.pip                              | 5 -----
 ...ents-3.6-0.20.1.conda => requirements-3.6-NIGHTLY.conda} | 2 +-
 ci/run_conda.sh                                             | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 ci/requirements-3.6-MASTER.pip
 rename ci/{requirements-3.6-0.20.1.conda => requirements-3.6-NIGHTLY.conda} (67%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd957493..8bdbfcd4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,12 +37,12 @@ jobs:
       - run: nox -s lint
 
   # Conda
-  "conda-3.6-0.20.1":
+  "conda-3.6-NIGHTLY":
     docker:
       - image: continuumio/miniconda3
     environment:
       PYTHON: "3.6"
-      PANDAS: "0.20.1"
+      PANDAS: "NIGHTLY"
     steps:
       - checkout
       - run: ci/config_auth.sh
@@ -56,4 +56,4 @@ workflows:
       - "pip-3.6"
       - "pip-3.7"
       - lint
-      - "conda-3.6-0.20.1"
\ No newline at end of file
+      - "conda-3.6-NIGHTLY"
\ No newline at end of file
diff --git a/ci/requirements-3.6-MASTER.pip b/ci/requirements-3.6-MASTER.pip
deleted file mode 100644
index 7f446342..00000000
--- a/ci/requirements-3.6-MASTER.pip
+++ /dev/null
@@ -1,5 +0,0 @@
---pre -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com/ pandas
-git+https://github.com/googleapis/google-cloud-python.git#egg=version_subpkg&subdirectory=api_core
-git+https://github.com/googleapis/google-cloud-python.git#egg=version_subpkg&subdirectory=core
-git+https://github.com/googleapis/google-cloud-python.git#egg=version_subpkg&subdirectory=bigquery
-pydata-google-auth==0.1.2
\ No newline at end of file
diff --git a/ci/requirements-3.6-0.20.1.conda b/ci/requirements-3.6-NIGHTLY.conda
similarity index 67%
rename from ci/requirements-3.6-0.20.1.conda
rename to ci/requirements-3.6-NIGHTLY.conda
index 1c7eb3f2..419abbad 100644
--- a/ci/requirements-3.6-0.20.1.conda
+++ b/ci/requirements-3.6-NIGHTLY.conda
@@ -1,5 +1,5 @@
 pydata-google-auth
-google-cloud-bigquery==1.9.0
+google-cloud-bigquery==1.10.0
 pytest
 pytest-cov
 codecov
diff --git a/ci/run_conda.sh b/ci/run_conda.sh
index 60ae6ff0..d0b892aa 100755
--- a/ci/run_conda.sh
+++ b/ci/run_conda.sh
@@ -11,7 +11,7 @@ conda update -q conda
 conda info -a
 conda create -q -n test-environment python=$PYTHON
 source activate test-environment
-if [[ "$PANDAS" == "MASTER" ]]; then
+if [[ "$PANDAS" == "NIGHTLY" ]]; then
   conda install -q numpy pytz python-dateutil;
   PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com";
   pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS pandas;

From 2691aba03141a45eeac0abfef3417a6e4e06d39e Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Wed, 3 Apr 2019 06:57:52 -0700
Subject: [PATCH 2/2] Restore non-nightly conda build.

---
 .circleci/config.yml                              | 15 +++++++++++++--
 ci/requirements-3.6-0.20.1.conda                  |  7 +++++++
 ...GHTLY.conda => requirements-3.7-NIGHTLY.conda} |  0
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ci/requirements-3.6-0.20.1.conda
 rename ci/{requirements-3.6-NIGHTLY.conda => requirements-3.7-NIGHTLY.conda} (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bdbfcd4..053280cd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,11 +37,21 @@ jobs:
       - run: nox -s lint
 
   # Conda
-  "conda-3.6-NIGHTLY":
+  "conda-3.6-0.20.1":
     docker:
       - image: continuumio/miniconda3
     environment:
       PYTHON: "3.6"
+      PANDAS: "0.20.1"
+    steps:
+      - checkout
+      - run: ci/config_auth.sh
+      - run: ci/run_conda.sh
+  "conda-3.7-NIGHTLY":
+    docker:
+      - image: continuumio/miniconda3
+    environment:
+      PYTHON: "3.7"
       PANDAS: "NIGHTLY"
     steps:
       - checkout
@@ -56,4 +66,5 @@ workflows:
       - "pip-3.6"
       - "pip-3.7"
       - lint
-      - "conda-3.6-NIGHTLY"
\ No newline at end of file
+      - "conda-3.6-0.20.1"
+      - "conda-3.7-NIGHTLY"
\ No newline at end of file
diff --git a/ci/requirements-3.6-0.20.1.conda b/ci/requirements-3.6-0.20.1.conda
new file mode 100644
index 00000000..1c7eb3f2
--- /dev/null
+++ b/ci/requirements-3.6-0.20.1.conda
@@ -0,0 +1,7 @@
+pydata-google-auth
+google-cloud-bigquery==1.9.0
+pytest
+pytest-cov
+codecov
+coverage
+flake8
diff --git a/ci/requirements-3.6-NIGHTLY.conda b/ci/requirements-3.7-NIGHTLY.conda
similarity index 100%
rename from ci/requirements-3.6-NIGHTLY.conda
rename to ci/requirements-3.7-NIGHTLY.conda