Skip to content

Commit 85f7caf

Browse files
committed
Merge remote-tracking branch 'upstream/travis' into release-4.1.2
2 parents 416f414 + a160c41 commit 85f7caf

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

.travis.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ env:
2020
- MB_ML_VER=2014
2121
- SKIP_NETWORK_TESTS=1
2222
- DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
23-
#
24-
# Build wheels with the oldest possible numpy version to avoid
25-
# the problem encountered by:
26-
#
27-
# https://github.com/RaRe-Technologies/gensim/issues/3085
28-
#
29-
- BUILD_DEPENDS="oldest-supported-numpy scipy==1.7.0"
3023
#
3124
# The contents of this file mirror the linux_testenv list
3225
# in gensim's setup.py. I can't think of a better way to include
@@ -36,23 +29,35 @@ env:
3629
- TEST_DEPENDS="pytest mock cython nmslib pyemd testfixtures Morfessor==2.0.2a4 python-levenshtein==0.12.0 visdom==0.1.8.9 scikit-learn"
3730

3831
matrix:
32+
#
33+
# See .github/workflows/build-wheels.yml for a discussion of why we
34+
# handle numpy versions explicitly.
35+
#
3936
- os: linux
4037
env:
4138
- MB_PYTHON_VERSION=3.6
4239
#
4340
# scipy 1.7.0 wheels not available for Py3.6, so we have to build using
4441
# an older version.
4542
#
46-
- BUILD_DEPENDS="oldest-supported-numpy scipy==1.5.3"
43+
- BUILD_DEPENDS="numpy==1.19.2 scipy==1.5.3"
4744
- os: linux
4845
env:
4946
- MB_PYTHON_VERSION=3.7
47+
- BUILD_DEPENDS="numpy==1.19.2 scipy==1.7.0"
5048
- os: linux
5149
env:
5250
- MB_PYTHON_VERSION=3.8
51+
- BUILD_DEPENDS="numpy==1.19.2 scipy==1.7.0"
5352
- os: linux
5453
env:
5554
- MB_PYTHON_VERSION=3.9
55+
#
56+
# oldest-supported-numpy does not seem to handle this particular case
57+
# (aarch64, Py3.9) explicitly, but I've double-checked that wheels for
58+
# this numpy release are available via PyPI.
59+
#
60+
- BUILD_DEPENDS="numpy==1.19.3 scipy==1.7.0"
5661

5762
before_install:
5863
- source multibuild/common_utils.sh

0 commit comments

Comments
 (0)