Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deprecate py27 (linux), add py39 (osx) #1336

Merged
merged 3 commits into from
Apr 2, 2021
Merged

Deprecate py27 (linux), add py39 (osx) #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d1d4a1
fixes #1334, adds py39 now that brew defaults this on osx
timkpaine Feb 25, 2021
9972212
update docker images
timkpaine Feb 25, 2021
fbe4362
Fix docker images
texodus Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ jobs:

strategy:
matrix:
Python27ManyLinux2010:
python.version: '2.7'
python_flag: '--python2'
manylinux_flag: '--manylinux2010'
artifact_name: 'cp27-cp27m-manylinux2010_x86_64'
# Python27ManyLinux2010:
# python.version: '2.7'
# python_flag: '--python2'
# manylinux_flag: '--manylinux2010'
# artifact_name: 'cp27-cp27m-manylinux2010_x86_64'
Python37ManyLinux2010:
python.version: '3.7'
python_flag: ''
Expand Down Expand Up @@ -111,6 +111,16 @@ jobs:
python_flag: '--python38'
manylinux_flag: '--manylinux2014'
artifact_name: 'cp38-cp38-manylinux2014_x86_64'
Python39ManyLinux2010:
python.version: '3.9'
python_flag: '--python39'
manylinux_flag: '--manylinux2010'
artifact_name: 'cp39-cp39-manylinux2010_x86_64'
Python39ManyLinux2014:
python.version: '3.9'
python_flag: '--python39'
manylinux_flag: '--manylinux2014'
artifact_name: 'cp39-cp39-manylinux2014_x86_64'

steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -183,6 +193,9 @@ jobs:
Python38:
python.version: '3.8'
python_flag: '--python38'
Python39:
python.version: '3.9'
python_flag: '--python39'

steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -229,6 +242,10 @@ jobs:
python.version: '3.7'
python_flag: ''
artifact_name: 'cp37-cp37m-macosx_10_15_x86_64'
Python39:
python.version: '3.9'
python_flag: '--python39'
artifact_name: 'cp39-cp39-macosx_10_15_x86_64'

${{ if or(startsWith(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['Build.Reason'], 'Schedule')) }}:
Python36:
Expand Down
12 changes: 10 additions & 2 deletions docker/python/manylinux2010/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
# the Apache License 2.0. The full license can be found in the LICENSE file.
#

FROM quay.io/pypa/manylinux2010_x86_64
# https://github.com/pypa/manylinux/issues/428#issuecomment-774729597
FROM quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
RUN yum -y install rapidjson-devel sudo wget

# Build new cmake
RUN wget https://cmake.org/files/v3.15/cmake-3.15.4-Linux-x86_64.sh -q
RUN mkdir /opt/cmake
RUN printf "y\nn\n" | sh cmake-3.15.4-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null
RUN rm -fr cmake*.sh /opt/cmake/doc
RUN rm -fr /usr/local/bin/cmake
RUN rm -fr /usr/local/bin/ctest
RUN rm -fr /opt/cmake/bin/cmake-gui
RUN rm -fr /opt/cmake/bin/ccmake
RUN rm -fr /opt/cmake/bin/cpack
Expand All @@ -25,13 +28,15 @@ RUN rm -rf /opt/python/cp27-cp27m/bin/auditwheel
RUN rm -rf /opt/python/cp36-cp36m/bin/auditwheel
RUN rm -rf /opt/python/cp37-cp37m/bin/auditwheel
RUN rm -rf /opt/python/cp38-cp38/bin/auditwheel
RUN rm -rf /opt/python/cp39-cp39/bin/auditwheel


# Copy assets
RUN cp -arf /opt/python/cp27-cp27m/* /usr/local/
RUN cp -arf /opt/python/cp36-cp36m/* /usr/local/
RUN cp -arf /opt/python/cp37-cp37m/* /usr/local/
RUN cp -arf /opt/python/cp38-cp38/* /usr/local/
RUN cp -arf /opt/python/cp39-cp39/* /usr/local/

ENV PATH=/usr/local/bin:$PATH

Expand All @@ -40,14 +45,16 @@ RUN python2.7 -m pip install numpy scipy pybind11 cython codecov mock pytest pyt
RUN python3.6 -m pip install numpy scipy pybind11 cython codecov mock black>=20 flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.7 -m pip install numpy scipy pybind11 cython codecov mock black>=20 flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.8 -m pip install numpy scipy pybind11 cython codecov mock black>=20 flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.9 -m pip install numpy scipy pybind11 cython codecov mock black>=20 flake8-black pytest pytest-cov traitlets ipywidgets faker psutil

# Install Auditwheel - not available on Python 2
RUN python3.6 -m pip install --ignore-installed auditwheel
RUN python3.7 -m pip install --ignore-installed auditwheel
RUN python3.8 -m pip install --ignore-installed auditwheel
RUN python3.9 -m pip install --ignore-installed auditwheel

# install boost
RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz >/dev/null 2>&1
RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz --no-check-certificate >/dev/null 2>&1
RUN tar xfz boost_1_71_0.tar.gz
# https://github.com/boostorg/build/issues/468
RUN cd boost_1_71_0 && ./bootstrap.sh
Expand All @@ -57,6 +64,7 @@ RUN python2.7 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=0.16.0'
RUN python3.6 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.7 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.8 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.9 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'

# install node
RUN curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
Expand Down
11 changes: 9 additions & 2 deletions docker/python/manylinux2014/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ RUN wget https://cmake.org/files/v3.15/cmake-3.15.4-Linux-x86_64.sh -q
RUN mkdir /opt/cmake
RUN printf "y\nn\n" | sh cmake-3.15.4-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null
RUN rm -fr cmake*.sh /opt/cmake/doc
RUN rm -fr /usr/local/bin/cmake
RUN rm -fr /usr/local/bin/ctest
RUN rm -fr /opt/cmake/bin/cmake-gui
RUN rm -fr /opt/cmake/bin/ccmake
RUN rm -fr /opt/cmake/bin/cpack
Expand All @@ -24,27 +26,31 @@ RUN ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest
RUN rm -rf /opt/python/cp36-cp36m/bin/auditwheel
RUN rm -rf /opt/python/cp37-cp37m/bin/auditwheel
RUN rm -rf /opt/python/cp38-cp38/bin/auditwheel
RUN rm -rf /opt/python/cp39-cp39/bin/auditwheel


# Copy assets
RUN cp -arf /opt/python/cp36-cp36m/* /usr/local/
RUN cp -arf /opt/python/cp37-cp37m/* /usr/local/
RUN cp -arf /opt/python/cp38-cp38/* /usr/local/
RUN cp -arf /opt/python/cp39-cp39/* /usr/local/

ENV PATH=/usr/local/bin:$PATH

# Install dependencies
RUN python3.6 -m pip install numpy scipy pybind11 cython codecov mock "black==20.8b1" flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.7 -m pip install numpy scipy pybind11 cython codecov mock "black==20.8b1" flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.8 -m pip install numpy scipy pybind11 cython codecov mock "black==20.8b1" flake8-black pytest pytest-cov traitlets ipywidgets faker psutil
RUN python3.9 -m pip install numpy scipy pybind11 cython codecov mock "black==20.8b1" flake8-black pytest pytest-cov traitlets ipywidgets faker psutil

# Install Auditwheel - not available on Python 2
RUN python3.6 -m pip install --ignore-installed auditwheel
RUN python3.7 -m pip install --ignore-installed auditwheel
RUN python3.8 -m pip install --ignore-installed auditwheel
RUN python3.9 -m pip install --ignore-installed auditwheel

# install boost
RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz >/dev/null 2>&1
RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz --no-check-certificate >/dev/null 2>&1
RUN tar xfz boost_1_71_0.tar.gz
# https://github.com/boostorg/build/issues/468
RUN cd boost_1_71_0 && ./bootstrap.sh
Expand All @@ -53,9 +59,10 @@ RUN cd boost_1_71_0 && ./b2 -j8 --with-program_options --with-filesystem --with-
RUN python3.6 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.7 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.8 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
RUN python3.9 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'

# install node
RUN curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
RUN curl -sL https://rpm.nodesource.com/setup_14.x | sudo bash -
RUN yum install -y nodejs

RUN npm install --global yarn
Expand Down
15 changes: 8 additions & 7 deletions python/perspective/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
# the Apache License 2.0. The full license can be found in the LICENSE file.
#
from __future__ import print_function
from setuptools import setup, find_packages, Extension
from setuptools.command.build_ext import build_ext
from setuptools.command.sdist import sdist
from distutils.version import LooseVersion
from codecs import open

import io
import os
import os.path
import re
import platform
import sys
import re
import subprocess
import sys
from codecs import open
from distutils.version import LooseVersion

from setuptools import Extension, find_packages, setup
from setuptools.command.build_ext import build_ext
from setuptools.command.sdist import sdist

try:
from shutil import which
Expand Down Expand Up @@ -75,6 +75,7 @@ def which(x):
"pytz>=2018.9",
"Sphinx>=1.8.4",
"sphinx-markdown-builder>=0.5.2",
"wheel",
] + requires

requires_dev = [
Expand Down
4 changes: 2 additions & 2 deletions scripts/_wheel_python.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const fs = require("fs-extra");
const IS_DOCKER = process.env.PSP_DOCKER;
const IS_MACOS = getarg("--macos");
const IS_PY2 = getarg("--python2");
const PYTHON = IS_PY2 ? "python2" : getarg("--python38") ? "python3.8" : getarg("--python36") ? "python3.6" : "python3.7";
const PYTHON = IS_PY2 ? "python2" : getarg("--python39") ? "python3.9" : getarg("--python38") ? "python3.8" : getarg("--python36") ? "python3.6" : "python3.7";

let IMAGE = "manylinux2014";
let MANYLINUX_VERSION;
Expand Down Expand Up @@ -64,7 +64,7 @@ try {

// These are system deps that may only be in place from pep-517/518 so
// lets reinstall them to be sure
cmd += `${PYTHON} -m pip install 'numpy>=1.13.1' && `;
cmd += `${PYTHON} -m pip install -U 'numpy>=1.13.1' wheel twine && `;

// remove the build folder so we completely rebuild (and pick up the
// libs we just installed above, since this build method won't use
Expand Down