merge for update

Author: makbigc

ci/code_checks.sh

@@ -194,6 +194,10 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
     invgrep -R --include="*.py" --include="*.pyx" -E 'class.*:\n\n( )+"""' .
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
+    MSG='Check for use of comment-based annotation syntax' ; echo $MSG
+    invgrep -R --include="*.py" -P '# type: (?!ignore)' pandas
+    RET=$(($RET + $?)) ; echo $MSG "DONE"
+
     MSG='Check that no file in the repo contains trailing whitespaces' ; echo $MSG
     set -o pipefail
     if [[ "$AZURE" == "true" ]]; then

ci/deps/azure-36-32bit.yaml

@@ -3,21 +3,24 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - python=3.6.*
+
+  # tools
+  ### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - attrs=19.1.0
   - gcc_linux-32
-  - gcc_linux-32
   - gxx_linux-32
   - numpy=1.14.*
   - python-dateutil
-  - python=3.6.*
   - pytz=2017.2
-  # universal
-  - pytest
-  - pytest-xdist
-  - pytest-mock
-  - pytest-azurepipelines
-  - hypothesis>=3.58.0
+
+  # see comment above
   - pip
   - pip:
-    # Anaconda doesn't build a new enough Cython
     - cython>=0.29.13
+    - pytest>=5.0.1

ci/deps/azure-36-locale.yaml

@@ -3,28 +3,30 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - python=3.6.*
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - beautifulsoup4==4.6.0
   - bottleneck=1.2.*
-  - cython=0.29.13
   - lxml
   - matplotlib=2.2.2
   - numpy=1.14.*
   - openpyxl=2.4.8
   - python-dateutil
   - python-blosc
-  - python=3.6.*
   - pytz=2017.2
   - scipy
   - sqlalchemy=1.1.4
   - xlrd=1.1.0
   - xlsxwriter=0.9.8
   - xlwt=1.2.0
-  # universal
-  - pytest>=5.0.0
-  - pytest-xdist>=1.29.0
-  - pytest-mock
-  - pytest-azurepipelines
-  - hypothesis>=3.58.0
   - pip
   - pip:
     - html5lib==1.0b2

ci/deps/azure-36-locale_slow.yaml

@@ -3,8 +3,17 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - beautifulsoup4
+  - python=3.6.*
+
+  # tools
   - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
+  - beautifulsoup4
   - gcsfs
   - html5lib
   - ipython
@@ -17,20 +26,11 @@ dependencies:
   - openpyxl
   - pytables
   - python-dateutil
-  - python=3.6.*
   - pytz
   - s3fs
   - scipy
   - xarray
   - xlrd
   - xlsxwriter
   - xlwt
-  # universal
-  - pytest>=4.0.2
-  - pytest-xdist
-  - pytest-mock
-  - pytest-azurepipelines
   - moto
-  - pip
-  - pip:
-    - hypothesis>=3.58.0

ci/deps/azure-36-minimum_versions.yaml

@@ -3,25 +3,27 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - python=3.6.1
+
+  # tools
+  - cython=0.29.13
+  - pytest=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - beautifulsoup4=4.6.0
   - bottleneck=1.2.1
-  - cython>=0.29.13
   - jinja2=2.8
   - numexpr=2.6.2
   - numpy=1.13.3
   - openpyxl=2.4.8
   - pytables=3.4.2
   - python-dateutil=2.6.1
-  - python=3.6.1
   - pytz=2017.2
   - scipy=0.19.0
   - xlrd=1.1.0
   - xlsxwriter=0.9.8
   - xlwt=1.2.0
-  # universal
   - html5lib=1.0.1
-  - hypothesis>=3.58.0
-  - pytest=4.5.0
-  - pytest-xdist
-  - pytest-mock
-  - pytest-azurepipelines

ci/deps/azure-37-locale.yaml

@@ -3,8 +3,17 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - beautifulsoup4
+  - python=3.7.*
+
+  # tools
   - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
+  - beautifulsoup4
   - html5lib
   - ipython
   - jinja2
@@ -17,19 +26,10 @@ dependencies:
   - openpyxl
   - pytables
   - python-dateutil
-  - python=3.7.*
   - pytz
   - s3fs
   - scipy
   - xarray
   - xlrd
   - xlsxwriter
   - xlwt
-  # universal
-  - pytest>=5.0.1
-  - pytest-xdist>=1.29.0
-  - pytest-mock
-  - pytest-azurepipelines
-  - pip
-  - pip:
-    - hypothesis>=3.58.0

ci/deps/azure-37-numpydev.yaml

@@ -3,20 +3,20 @@ channels:
   - defaults
 dependencies:
   - python=3.7.*
-  - pytz
-  - Cython>=0.29.13
-  # universal
-  # pytest < 5 until defaults has pytest-xdist>=1.29.0
-  - pytest>=4.0.2,<5.0
-  - pytest-xdist
-  - pytest-mock
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
   - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
+  - pytz
   - pip
   - pip:
     - "git+git://github.com/dateutil/dateutil.git"
     - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
     - "--pre"
     - "numpy"
     - "scipy"
-    # https://github.com/pandas-dev/pandas/issues/27421
-    - pytest-azurepipelines<1.0.0

ci/deps/azure-macos-36.yaml

@@ -2,6 +2,16 @@ name: pandas-dev
 channels:
   - defaults
 dependencies:
+  - python=3.6.*
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - beautifulsoup4
   - bottleneck
   - html5lib
@@ -14,7 +24,6 @@ dependencies:
   - openpyxl
   - pyarrow
   - pytables
-  - python=3.6.*
   - python-dateutil==2.6.1
   - pytz
   - xarray
@@ -23,13 +32,4 @@ dependencies:
   - xlwt
   - pip
   - pip:
-    # Anaconda / conda-forge don't build for 3.5
-    - cython>=0.29.13
     - pyreadstat
-    # universal
-    - pytest>=5.0.1
-    - pytest-xdist>=1.29.0
-    - pytest-mock
-    - hypothesis>=3.58.0
-    # https://github.com/pandas-dev/pandas/issues/27421
-    - pytest-azurepipelines<1.0.0

ci/deps/azure-windows-36.yaml

@@ -3,26 +3,28 @@ channels:
   - conda-forge
   - defaults
 dependencies:
+  - python=3.6.*
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - blosc
   - bottleneck
-  - fastparquet>=0.2.1
+  - fastparquet>=0.3.2
   - matplotlib=3.0.2
   - numexpr
   - numpy=1.15.*
   - openpyxl
   - pyarrow
   - pytables
   - python-dateutil
-  - python=3.6.*
   - pytz
   - scipy
   - xlrd
   - xlsxwriter
   - xlwt
-  # universal
-  - cython>=0.29.13
-  - pytest>=5.0.1
-  - pytest-xdist>=1.29.0
-  - pytest-mock
-  - pytest-azurepipelines
-  - hypothesis>=3.58.0

ci/deps/azure-windows-37.yaml

@@ -3,6 +3,16 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - python=3.7.*
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-azurepipelines
+
+  # pandas dependencies
   - beautifulsoup4
   - bottleneck
   - gcsfs
@@ -15,7 +25,6 @@ dependencies:
   - numpy=1.14.*
   - openpyxl
   - pytables
-  - python=3.7.*
   - python-dateutil
   - pytz
   - s3fs
@@ -24,11 +33,4 @@ dependencies:
   - xlrd
   - xlsxwriter
   - xlwt
-  # universal
-  - cython>=0.29.13
-  - pytest>=5.0.0
-  - pytest-xdist>=1.29.0
-  - pytest-mock
-  - pytest-azurepipelines
-  - hypothesis>=3.58.0
   - pyreadstat

ci/deps/travis-36-cov.yaml

@@ -3,11 +3,21 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - python=3.6.*
+
+  # tools
+  - cython>=0.29.13
+  - pytest>=5.0.1
+  - pytest-xdist>=1.21
+  - hypothesis>=3.58.0
+  - pytest-cov  # this is only needed in the coverage build
+
+  # pandas dependencies
   - beautifulsoup4
   - botocore>=1.11
   - cython>=0.29.13
   - dask
-  - fastparquet>=0.2.1
+  - fastparquet>=0.3.2
   - gcsfs
   - geopandas
   - html5lib
@@ -27,7 +37,6 @@ dependencies:
   - pymysql
   - pytables
   - python-snappy
-  - python=3.6.*
   - pytz
   - s3fs
   - scikit-learn
@@ -38,12 +47,6 @@ dependencies:
   - xlrd
   - xlsxwriter
   - xlwt
-  # universal
-  - pytest>=5.0.1
-  - pytest-xdist>=1.29.0
-  - pytest-cov
-  - pytest-mock
-  - hypothesis>=3.58.0
   - pip
   - pip:
     - brotlipy