CI: don't specify google-auth (pandas-dev#25994)

ricoyudog · Apr 5, 2019 · 1322eb0 · 1322eb0
1 parent 9fbb9e7
commit 1322eb0
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 3 deletions.
diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml
@@ -23,6 +23,7 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - isort
+  - pip
   - pip:
     # for python 3.5, pytest>=4.0.2 is not available in conda
     - pytest>=4.0.2

diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml
@@ -25,5 +25,6 @@ dependencies:
   - pytest-mock
   - hypothesis>=3.58.0
   - isort
+  - pip
   - pip:
     - html5lib==1.0b2
diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml
@@ -31,5 +31,6 @@ dependencies:
   - pytest-mock
   - moto
   - isort
+  - pip
   - pip:
     - hypothesis>=3.58.0
diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml
@@ -29,6 +29,7 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - isort
+  - pip
   - pip:
     - hypothesis>=3.58.0
     - moto  # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed
diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml
@@ -11,6 +11,7 @@ dependencies:
   - pytest-mock
   - hypothesis>=3.58.0
   - isort
+  - pip
   - pip:
     - "git+git://github.com/dateutil/dateutil.git"
     - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"

diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml
@@ -17,11 +17,10 @@ dependencies:
   - numpy=1.15.*
   - openpyxl
   - pandas-gbq
+  # https://github.com/pydata/pandas-gbq/issues/271
+  - google-cloud-bigquery<=1.11
   - psycopg2
   - pyarrow=0.9.0
-  # add pydata-google-auth until for pandas-gbq, see
-  # https://github.com/conda-forge/pandas-gbq-feedstock/issues/18
-  - pydata-google-auth
   - pymysql
   - pytables
   - python-snappy
@@ -43,6 +42,7 @@ dependencies:
   - pytest-mock
   - hypothesis>=3.58.0
   - isort
+  - pip
   - pip:
     - brotlipy
     - coverage

diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml
@@ -40,5 +40,6 @@ dependencies:
   - pytest-mock
   - moto
   - isort
+  - pip
   - pip:
     - hypothesis>=3.58.0
diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml
@@ -12,11 +12,13 @@ dependencies:
   - nomkl
   - pyarrow
   - pytz
+  # universal
   - pytest>=4.0.2
   - pytest-xdist
   - pytest-mock
   - hypothesis>=3.58.0
   - s3fs
   - isort
+  - pip
   - pip:
     - moto
diff --git a/environment.yml b/environment.yml
@@ -25,6 +25,7 @@ dependencies:
   - pytest-mock
   - sphinx
   - numpydoc
+  - pip
 
   # optional
   - beautifulsoup4>=4.2.1

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -16,6 +16,7 @@ pytest>=4.0.2
 pytest-mock
 sphinx
 numpydoc
+pip
 beautifulsoup4>=4.2.1
 blosc
 botocore>=1.11
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,5 +31,6 @@ dependencies: @@
       - pytest-mock
       - moto
       - isort
+      - pip
       - pip:
         - hypothesis>=3.58.0