diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 708c08239c7c0..d0a48bd3f8b27 100644 --- 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 index 4209247cd6ce5..f43ed0249985e 100644 --- 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 index fa2749017ec07..2a0404614dcfc 100644 --- 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 index 71d69d0ab68c1..649f5892f174d 100644 --- 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 index d940463e2768c..6848b9990b46e 100644 --- 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 index 47a494bc1a26e..606b5bac8306d 100644 --- 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 index 71022320da674..1d219bbcb671c 100644 --- 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 index 3ddd08e640806..4bf7d516711f7 100644 --- 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 index a1042be48156c..48b873d4c3a3d 100644 --- 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 index 173441489b388..5600e43ea09c5 100644 --- 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