Skip to content
This repository was archived by the owner on May 3, 2023. It is now read-only.

Commit 2fe68bd

Browse files
Merge remote-tracking branch 'upstream/master' into test-1.4.x
2 parents 5ac2535 + 6349bb0 commit 2fe68bd

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ env:
1313
- PLAT=aarch64
1414
- NP_BUILD_DEP="numpy==1.17.3"
1515
- NP_TEST_DEP="numpy==1.17.3"
16-
- CYTHON_BUILD_DEP="cython==0.29.30"
16+
- CYTHON_BUILD_DEP="cython==0.29.32"
1717
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
18-
- TEST_DEPENDS="pytest pytest-xdist hypothesis"
18+
- TEST_DEPENDS="pytest pytest-xdist hypothesis==6.52.1"
1919
- TEST_DIR="tmp_for_test"
2020
- MB_ML_VER=2014
2121
- DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8

azure/posix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
BUILD_COMMIT: "1.4.x"
1313
PLAT: "x86_64"
1414
NP_BUILD_DEP: "numpy==1.17.3"
15-
CYTHON_BUILD_DEP: "cython==0.29.30"
15+
CYTHON_BUILD_DEP: "cython==0.29.32"
1616
NIGHTLY_BUILD_COMMIT: "main"
1717
NIGHTLY_BUILD: "false"
18-
TEST_DEPENDS: "pytest pytest-xdist hypothesis"
18+
TEST_DEPENDS: "pytest pytest-xdist hypothesis==6.52.1"
1919
TEST_DIR: "tmp_for_test"
2020
strategy:
2121
matrix:

azure/windows.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ jobs:
1010
variables:
1111
BUILD_COMMIT: "1.4.x"
1212
NP_BUILD_DEP: "1.17.3"
13-
CYTHON_BUILD_DEP: "0.29.30"
13+
CYTHON_BUILD_DEP: "0.29.32"
1414
NIGHTLY_BUILD_COMMIT: "main"
1515
NIGHTLY_BUILD: "false"
1616
PYTHON_ARCH: "x64"
17-
# https://github.com/pandas-dev/pandas/issues/47332
18-
TEST_DEPENDS: "pytest pytest-xdist hypothesis tzdata"
17+
TEST_DEPENDS: "pytest pytest-xdist hypothesis==6.52.1"
1918
TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test'
2019
strategy:
2120
matrix:

config.sh

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ function run_tests {
3636
echo $PATH
3737
echo ${MB_PYTHON_VERSION}
3838
which -a python
39-
# Pin setuptools < 60
40-
pip install "setuptools<60"
4139
pip list
4240
python -c 'import pandas; pandas.show_versions()'
4341
# Skip test_float_precision_options: https://github.com/pandas-dev/pandas/issues/36429

0 commit comments

Comments
 (0)