Skip to content

Commit be43357

Browse files
Bump dependency versions for CI builds
- Update numpy from 1.14.6 to 1.16.6 - Build for macos 10.13 - Build on manylinux2010 instead of manylinux1 - Python 3.7 on readthedocs instead of 3.6
1 parent 881c168 commit be43357

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

.ci/build_wheels.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ echo "Building for ${PYBIN}..."
88
${PYBIN}/pip install --user cython
99

1010
# Numpy must be available for openTSNE to be built
11-
${PYBIN}/pip install --user numpy==1.14.6
11+
${PYBIN}/pip install --user numpy==1.16.6
1212

1313
# List installed dependency versions
1414
${PYBIN}/pip freeze
1515

1616
# Force wheel to use old version of numpy, otherwise it tries to download latest version
17-
echo numpy==1.14.6 > requirements_numpy.txt
17+
echo numpy==1.16.6 > requirements_numpy.txt
1818
# Compile openTSNE wheels
1919
${PYBIN}/pip wheel -w wheelhouse/ -r requirements_numpy.txt .
2020

azure-pipelines-release.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
variables:
22
AZURE_BUILD: true
3-
MACOSX_DEPLOYMENT_TARGET: '10.6'
43

54
trigger:
65
tags:
@@ -52,11 +51,14 @@ jobs:
5251
architecture: 'x64'
5352
displayName: 'Use Python $(python.version)'
5453

54+
- script: env
55+
displayName: 'List enviromental variables'
56+
5557
- script: |
5658
python -m pip install --upgrade pip
5759
python -m pip install setuptools wheel pytest
5860
python -m pip install cython
59-
python -m pip install numpy==1.14.6
61+
python -m pip install numpy==1.16.6
6062
displayName: 'Install job dependencies'
6163
6264
- script: python -m pip freeze
@@ -124,8 +126,8 @@ jobs:
124126
python.version: '3.9'
125127

126128
container:
127-
image: quay.io/pypa/manylinux1_x86_64:latest
128-
options: -e PLAT=manylinux1_x86_64
129+
image: quay.io/pypa/manylinux2010_x86_64:latest
130+
options: -e PLAT=manylinux2010_x86_64
129131

130132
steps:
131133
- bash: ls -R /opt/python
@@ -193,7 +195,7 @@ jobs:
193195
python -m pip install --upgrade pip
194196
python -m pip install setuptools wheel pytest
195197
python -m pip install cython
196-
python -m pip install numpy==1.14.6
198+
python -m pip install numpy==1.16.6
197199
displayName: 'Install job dependencies'
198200
199201
- script: python -m pip freeze

azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ jobs:
5757
architecture: 'x64'
5858
displayName: 'Use Python $(python.version)'
5959

60+
- script: env
61+
displayName: 'List enviromental variables'
62+
6063
- script: |
6164
python -m pip install --upgrade pip
6265
python -m pip install flake8 pytest

readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ build:
22
image: latest
33

44
python:
5-
version: 3.6
5+
version: 3.7
66
setup_py_install: true
77

88
requirements_file: docs/requirements-doc.txt

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ def build_extensions(self):
158158
elif compiler == "msvc":
159159
annoy_ext.extra_compile_args += ["/std:c++14"]
160160

161-
# Annoy #349: something with OS X Mojave causes libstd not to be found
161+
# Set minimum deployment version for MacOS
162162
if compiler == "unix" and platform.system() == "Darwin":
163-
annoy_ext.extra_compile_args += ["-mmacosx-version-min=10.12"]
164-
annoy_ext.extra_link_args += ["-stdlib=libc++", "-mmacosx-version-min=10.12"]
163+
extra_compile_args += ["-mmacosx-version-min=10.12"]
164+
extra_link_args += ["-stdlib=libc++", "-mmacosx-version-min=10.12"]
165165

166166
# We don't want the compiler to optimize for system architecture if
167167
# we're building packages to be distributed by conda-forge, but if the
@@ -304,7 +304,7 @@ def readme():
304304
packages=setuptools.find_packages(include=["openTSNE", "openTSNE.*"]),
305305
python_requires=">=3.6",
306306
install_requires=[
307-
"numpy>=1.14.6",
307+
"numpy>=1.16.6",
308308
"scikit-learn>=0.20",
309309
"scipy",
310310
],

0 commit comments

Comments
 (0)