From 6a954f2849d59516f33b94a3f4e5d453df1c8ded Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sun, 17 Nov 2019 19:23:49 +0000 Subject: [PATCH 1/8] DEPS: Unifying testing and building dependencies across builds --- ci/deps/azure-36-32bit.yaml | 21 +++++++++------------ ci/deps/azure-36-locale.yaml | 17 +++++++++-------- ci/deps/azure-36-locale_slow.yaml | 19 +++++++++---------- ci/deps/azure-36-minimum_versions.yaml | 17 +++++++++-------- ci/deps/azure-37-locale.yaml | 19 +++++++++---------- ci/deps/azure-37-numpydev.yaml | 15 +++++++-------- ci/deps/azure-macos-36.yaml | 19 +++++++++---------- ci/deps/azure-windows-36.yaml | 17 +++++++++-------- ci/deps/azure-windows-37.yaml | 17 +++++++++-------- ci/deps/travis-36-cov.yaml | 15 ++++++++------- ci/deps/travis-36-locale.yaml | 17 ++++++++--------- ci/deps/travis-36-slow.yaml | 15 ++++++++------- ci/deps/travis-37.yaml | 15 ++++++++------- 13 files changed, 111 insertions(+), 112 deletions(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 1e2e6c33e8c15..39c53e03c15b3 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -3,21 +3,18 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - 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 - - pip - - pip: - # Anaconda doesn't build a new enough Cython - - cython>=0.29.13 diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 76868f598f11b..182e4c2ed8812 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -3,28 +3,29 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - 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 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 21205375204dc..88b81d5c1e42d 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -3,8 +3,16 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - - cython>=0.29.13 - gcsfs - html5lib - ipython @@ -17,7 +25,6 @@ dependencies: - openpyxl - pytables - python-dateutil - - python=3.6.* - pytz - s3fs - scipy @@ -25,12 +32,4 @@ dependencies: - xlrd - xlsxwriter - xlwt - # universal - - pytest>=4.0.2 - - pytest-xdist - - pytest-mock - - pytest-azurepipelines - moto - - pip - - pip: - - hypothesis>=3.58.0 diff --git a/ci/deps/azure-36-minimum_versions.yaml b/ci/deps/azure-36-minimum_versions.yaml index e2c78165fe4b9..6f451ea85ff2e 100644 --- a/ci/deps/azure-36-minimum_versions.yaml +++ b/ci/deps/azure-36-minimum_versions.yaml @@ -3,25 +3,26 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.1 + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - 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 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 24464adb74f5b..a250781331e25 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -3,8 +3,16 @@ channels: - defaults - conda-forge dependencies: + - python=3.7.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - - cython>=0.29.13 - html5lib - ipython - jinja2 @@ -17,7 +25,6 @@ dependencies: - openpyxl - pytables - python-dateutil - - python=3.7.* - pytz - s3fs - scipy @@ -25,11 +32,3 @@ dependencies: - xlrd - xlsxwriter - xlwt - # universal - - pytest>=5.0.1 - - pytest-xdist>=1.29.0 - - pytest-mock - - pytest-azurepipelines - - pip - - pip: - - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 0fb06fd43724c..ebba388d99908 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -3,14 +3,15 @@ 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 + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies + - pytz - pip - pip: - "git+git://github.com/dateutil/dateutil.git" @@ -18,5 +19,3 @@ dependencies: - "--pre" - "numpy" - "scipy" - # https://github.com/pandas-dev/pandas/issues/27421 - - pytest-azurepipelines<1.0.0 diff --git a/ci/deps/azure-macos-36.yaml b/ci/deps/azure-macos-36.yaml index 85c090bf6f938..7c4acd6bcf355 100644 --- a/ci/deps/azure-macos-36.yaml +++ b/ci/deps/azure-macos-36.yaml @@ -2,6 +2,15 @@ name: pandas-dev channels: - defaults dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - bottleneck - html5lib @@ -14,7 +23,6 @@ dependencies: - openpyxl - pyarrow - pytables - - python=3.6.* - python-dateutil==2.6.1 - pytz - xarray @@ -23,13 +31,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 diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 88b38aaef237c..1982b7e3519d8 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -3,6 +3,15 @@ channels: - conda-forge - defaults dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies - blosc - bottleneck - fastparquet>=0.2.1 @@ -13,16 +22,8 @@ dependencies: - 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 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 7680ed9fd9c92..32303c1186381 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -3,6 +3,15 @@ channels: - defaults - conda-forge dependencies: + - python=3.7.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - bottleneck - gcsfs @@ -15,7 +24,6 @@ dependencies: - numpy=1.14.* - openpyxl - pytables - - python=3.7.* - python-dateutil - pytz - s3fs @@ -24,11 +32,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 diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index b2a74fceaf0fa..a7cd8656cd7aa 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -3,6 +3,14 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + # pandas dependencies - beautifulsoup4 - botocore>=1.11 - cython>=0.29.13 @@ -27,7 +35,6 @@ dependencies: - pymysql - pytables - python-snappy - - python=3.6.* - pytz - s3fs - scikit-learn @@ -38,12 +45,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 diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 09f72e65098c9..1b2e972ed905c 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -3,10 +3,17 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + # pandas dependencies - beautifulsoup4 - blosc=1.14.3 - python-blosc - - cython>=0.29.13 - fastparquet=0.2.1 - gcsfs=0.2.2 - html5lib @@ -24,7 +31,6 @@ dependencies: - pymysql=0.7.11 - pytables - python-dateutil - - python=3.6.* - pytz - s3fs=0.3.0 - scipy @@ -33,10 +39,3 @@ dependencies: - xlrd - xlsxwriter - xlwt - # universal - - pytest>=5.0.1 - - pytest-xdist>=1.29.0 - - pytest-mock - - pip - - pip: - - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index e9c5dadbc924a..215225419bcf3 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -3,8 +3,15 @@ channels: - defaults - conda-forge dependencies: + - python=3.6.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + # pandas dependencies - beautifulsoup4 - - cython>=0.29.13 - html5lib - lxml - matplotlib @@ -16,7 +23,6 @@ dependencies: - pymysql - pytables - python-dateutil - - python=3.6.* - pytz - s3fs - scipy @@ -24,9 +30,4 @@ dependencies: - xlrd - xlsxwriter - xlwt - # universal - - pytest>=5.0.0 - - pytest-xdist>=1.29.0 - - pytest-mock - moto - - hypothesis>=3.58.0 diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index 903636f2fe060..acc57f9e6b6d2 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -5,20 +5,21 @@ channels: - c3i_test dependencies: - python=3.7.* + # tools + - cython=0.29.13 + - pytest + - pytest-xdist>=1.21 + - pytest-mock + - hypothesis>=3.58.0 + # pandas dependencies - botocore>=1.11 - - cython>=0.29.13 - numpy - python-dateutil - nomkl - pyarrow - pytz - # universal - - pytest>=5.0.0 - - pytest-xdist>=1.29.0 - - pytest-mock - - hypothesis>=3.58.0 - s3fs - - pip - pyreadstat + - pip - pip: - moto From a6820c77b7b74948d05a8f83df4bf62ddd991fb6 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sun, 17 Nov 2019 20:13:43 +0000 Subject: [PATCH 2/8] using pip instead of conda for cython in 32 bits --- ci/deps/azure-36-32bit.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 39c53e03c15b3..30a9da553f897 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -5,7 +5,7 @@ channels: dependencies: - python=3.6.* # tools - - cython=0.29.13 + # - cython=0.29.13 ### Cython 0.29.13 for 32 bits is not available with conda, installing below with pip instead - pytest - pytest-xdist>=1.21 - pytest-mock @@ -18,3 +18,8 @@ dependencies: - numpy=1.14.* - python-dateutil - pytz=2017.2 + + # see comment above + - pip + - pip: + - cython==0.29.13 From 1bc38f3ca9d477bb3a163c903fb8cdfe2c0bf0a5 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sun, 17 Nov 2019 21:44:05 +0000 Subject: [PATCH 3/8] Adding pytest-cov, deleted by mistake --- ci/deps/travis-36-cov.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index a7cd8656cd7aa..bd6007a62f9ba 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -10,6 +10,7 @@ dependencies: - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 + - pytest-cov # this is only needed in the coverage build # pandas dependencies - beautifulsoup4 - botocore>=1.11 From 492736b2b6124c147ceee264de56697b00de6fe2 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sun, 17 Nov 2019 23:16:17 +0000 Subject: [PATCH 4/8] Addressing PR comments --- ci/deps/azure-36-32bit.yaml | 8 +++++--- ci/deps/azure-36-locale.yaml | 6 ++++-- ci/deps/azure-36-locale_slow.yaml | 6 ++++-- ci/deps/azure-36-minimum_versions.yaml | 6 ++++-- ci/deps/azure-37-locale.yaml | 6 ++++-- ci/deps/azure-37-numpydev.yaml | 6 ++++-- ci/deps/azure-macos-36.yaml | 6 ++++-- ci/deps/azure-windows-36.yaml | 6 ++++-- ci/deps/azure-windows-37.yaml | 6 ++++-- ci/deps/travis-36-cov.yaml | 6 ++++-- ci/deps/travis-36-locale.yaml | 6 ++++-- ci/deps/travis-36-slow.yaml | 6 ++++-- ci/deps/travis-37.yaml | 6 ++++-- 13 files changed, 53 insertions(+), 27 deletions(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 30a9da553f897..698247fd498cf 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - # - cython=0.29.13 ### Cython 0.29.13 for 32 bits is not available with conda, installing below with pip instead - - pytest + # - cython>=0.29.13 ### Cython 0.29.13 for 32 bits is not available with conda, installing below with pip instead + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - attrs=19.1.0 - gcc_linux-32 @@ -22,4 +24,4 @@ dependencies: # see comment above - pip - pip: - - cython==0.29.13 + - cython>=0.29.13 diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 182e4c2ed8812..f1e8e73e0ff5d 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4==4.6.0 - bottleneck=1.2.* diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 88b81d5c1e42d..a542ef5383760 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - gcsfs diff --git a/ci/deps/azure-36-minimum_versions.yaml b/ci/deps/azure-36-minimum_versions.yaml index 6f451ea85ff2e..afef7cfc77573 100644 --- a/ci/deps/azure-36-minimum_versions.yaml +++ b/ci/deps/azure-36-minimum_versions.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.6.1 + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4=4.6.0 - bottleneck=1.2.1 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index a250781331e25..99fa7f07f5d7e 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.7.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - html5lib diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index ebba388d99908..f7d542522a51a 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -3,13 +3,15 @@ channels: - defaults dependencies: - python=3.7.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - pytz - pip diff --git a/ci/deps/azure-macos-36.yaml b/ci/deps/azure-macos-36.yaml index 7c4acd6bcf355..4f4596ff2ebe3 100644 --- a/ci/deps/azure-macos-36.yaml +++ b/ci/deps/azure-macos-36.yaml @@ -3,13 +3,15 @@ channels: - defaults dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - bottleneck diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 1982b7e3519d8..53149f424b588 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -4,13 +4,15 @@ channels: - defaults dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - blosc - bottleneck diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 32303c1186381..c464b0c9bf6c3 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.7.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-azurepipelines + # pandas dependencies - beautifulsoup4 - bottleneck diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index bd6007a62f9ba..94d08c9c679b5 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -4,13 +4,15 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 - pytest-cov # this is only needed in the coverage build + # pandas dependencies - beautifulsoup4 - botocore>=1.11 diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 1b2e972ed905c..0bede5673e505 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -4,12 +4,14 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 + # pandas dependencies - beautifulsoup4 - blosc=1.14.3 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index 215225419bcf3..a26b4fd04b71c 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -4,12 +4,14 @@ channels: - conda-forge dependencies: - python=3.6.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 + # pandas dependencies - beautifulsoup4 - html5lib diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index acc57f9e6b6d2..c3ad2b89bc49b 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -5,12 +5,14 @@ channels: - c3i_test dependencies: - python=3.7.* + # tools - - cython=0.29.13 - - pytest + - cython>=0.29.13 + - pytest>=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 + # pandas dependencies - botocore>=1.11 - numpy From a455fe30418a84cdfac365203c86ef9c9fb774dc Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 21 Nov 2019 00:45:23 +0000 Subject: [PATCH 5/8] Testing with minimum cython and pytest --- ci/deps/azure-36-minimum_versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-36-minimum_versions.yaml b/ci/deps/azure-36-minimum_versions.yaml index afef7cfc77573..1120ff62b8b11 100644 --- a/ci/deps/azure-36-minimum_versions.yaml +++ b/ci/deps/azure-36-minimum_versions.yaml @@ -6,8 +6,8 @@ dependencies: - python=3.6.1 # tools - - cython>=0.29.13 - - pytest>=4.0.2 + - cython=0.29.13 + - pytest=4.0.2 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 From a7aa71de87750c7e8913993a87b7278499b000ae Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 21 Nov 2019 01:08:00 +0000 Subject: [PATCH 6/8] Upgrading pytest, and editing 3.8 build --- ci/deps/azure-36-32bit.yaml | 2 +- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-36-minimum_versions.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/azure-macos-36.yaml | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/azure-windows-37.yaml | 2 +- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- ci/deps/travis-38.yaml | 11 +++++++---- environment.yml | 2 +- 15 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 698247fd498cf..d1d37a0a523b0 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -7,7 +7,7 @@ dependencies: # tools # - cython>=0.29.13 ### Cython 0.29.13 for 32 bits is not available with conda, installing below with pip instead - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index f1e8e73e0ff5d..3baf975afc096 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index a542ef5383760..01741e9b65a7a 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-36-minimum_versions.yaml b/ci/deps/azure-36-minimum_versions.yaml index 1120ff62b8b11..1e32ef7482be3 100644 --- a/ci/deps/azure-36-minimum_versions.yaml +++ b/ci/deps/azure-36-minimum_versions.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython=0.29.13 - - pytest=4.0.2 + - pytest=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 99fa7f07f5d7e..26446ab5365b1 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index f7d542522a51a..3264df5944e35 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -6,7 +6,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-macos-36.yaml b/ci/deps/azure-macos-36.yaml index 4f4596ff2ebe3..48ba87d26f53d 100644 --- a/ci/deps/azure-macos-36.yaml +++ b/ci/deps/azure-macos-36.yaml @@ -6,7 +6,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 53149f424b588..e3ad1d8371623 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index c464b0c9bf6c3..07e134b054c10 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 94d08c9c679b5..9148e0d4b29d9 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 0bede5673e505..3199ee037bc0a 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index a26b4fd04b71c..eab374c96772c 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index c3ad2b89bc49b..7b75a427a4954 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.13 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-xdist>=1.21 - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-38.yaml b/ci/deps/travis-38.yaml index bd62ffa9248fe..88da1331b463a 100644 --- a/ci/deps/travis-38.yaml +++ b/ci/deps/travis-38.yaml @@ -4,13 +4,16 @@ channels: - conda-forge dependencies: - python=3.8.* + + # tools - cython>=0.29.13 + - pytest>=5.0.1 + - pytest-xdist>=1.29.0 # The rest of the builds use >=1.21, and use pytest-mock + - hypothesis>=3.58.0 + + # pandas dependencies - numpy - python-dateutil - nomkl - pytz - # universal - - pytest>=5.0.0 - - pytest-xdist>=1.29.0 - - hypothesis>=3.58.0 - pip diff --git a/environment.yml b/environment.yml index ef5767f26dceb..54c99f415165d 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - botocore>=1.11 - hypothesis>=3.82 - moto # mock S3 - - pytest>=4.0.2 + - pytest>=5.0.1 - pytest-cov - pytest-xdist>=1.21 - seaborn From 1692d3cf5ae17dbaeeda8bd5ec357c3966cf174f Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 21 Nov 2019 01:15:37 +0000 Subject: [PATCH 7/8] pytest from pip for 32 bits (new required version not in conda) --- ci/deps/azure-36-32bit.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index d1d37a0a523b0..f3e3d577a7a33 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -6,8 +6,7 @@ dependencies: - python=3.6.* # tools - # - cython>=0.29.13 ### Cython 0.29.13 for 32 bits is not available with conda, installing below with pip instead - - pytest>=5.0.1 + ### 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 - pytest-mock - hypothesis>=3.58.0 @@ -25,3 +24,4 @@ dependencies: - pip - pip: - cython>=0.29.13 + - pytest>=5.0.1 From 01dfdf354afc8ace7e1110b0e1e49f141c8f92f3 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 21 Nov 2019 01:48:59 +0000 Subject: [PATCH 8/8] Sync pip deps --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3ae5b57de5d02..87b348c39a17b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -30,7 +30,7 @@ boto3 botocore>=1.11 hypothesis>=3.82 moto -pytest>=4.0.2 +pytest>=5.0.1 pytest-cov pytest-xdist>=1.21 seaborn