Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

drop python3.6, add pypy3.7 #103

Merged
merged 1 commit into from
Nov 18, 2020
Merged

drop python3.6, add pypy3.7 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 0 additions & 39 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,6 @@ os: linux

jobs:
include:
- os: linux
arch: x86_64
env:
- MB_PYTHON_VERSION=pypy3.6-7.3.1
- MB_ML_VER=2010
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}

# The manylinux2014 arm64 image has libbz2.so.1 and libbz.so.1.0.6 but not
# libbz2.so.1.0, leading to this error with pypy:
# pypy3.6-v7.3.1-aarch64/bin/pypy: error while loading shared libraries:
# libbz2.so.1.0: cannot open shared object file: No such file or directory
#- os: linux
# arch: arm64
# env:
# - PLAT=aarch64
# - MB_ML_VER=2014
# - MB_PYTHON_VERSION=pypy3.6-7.3.1
# - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}

# The pypy3 osx package has bin/pypy3 not bin/pypy, so
# multibuild/common_utils.sh has a "ln" command (not "ln -s"). Apparently
# it does not work, we get the error message:
# multibuild/common_utils.sh: line 476:
# /Users/travis/build/MacPython/numpy-wheels/pypy3.6-v7.3.1-linux64/bin/pypy:
# cannot execute binary file
# - os: osx
# language: generic
# env:
# - MB_PYTHON_VERSION=pypy3.6-7.3.1
# - MB_PYTHON_OSX_VER=10.9

- os: linux
arch: arm64
env:
- PLAT=aarch64
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.6
- DEBUG_PRINT=1
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: arm64
env:
Expand Down
38 changes: 5 additions & 33 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@ jobs:
name: windows2017
vmImage: vs2017-win2016
matrix:
py_3.6_32:
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "x86"
BITS: 32
pypy_3.6_32:
PYTHON_VERSION: "PyPy3.6"
PYTHON_ARCH: "x86"
BITS: 32
EXTRA_ARGV: "'-m', 'not slow'"
py_3.6_64:
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: 'x64'
BITS: 64
py_3.7_32:
PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "x86"
Expand Down Expand Up @@ -62,21 +49,17 @@ jobs:
name: linux
vmImage: ubuntu-18.04
matrix:
py_3.6_32:
MB_PYTHON_VERSION: "3.6"
PLAT: "i686"
MB_ML_VER: "2010"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.6_64:
MB_PYTHON_VERSION: "3.6"
MB_ML_VER: "2010"
py_3.7_32:
MB_PYTHON_VERSION: "3.7"
PLAT: "i686"
MB_ML_VER: "2010"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
pypy_3.7_64:
MB_PYTHON_VERSION: "pypy3.7-7.3.2"
AZURE_PYTHON_VERSION: "3.7"
MB_ML_VER: "2010"
DOCKER_TEST_IMAGE: multibuild/xenial_{PLAT}
py_3.7_64:
MB_PYTHON_VERSION: "3.7"
MB_ML_VER: "2010"
Expand All @@ -101,15 +84,6 @@ jobs:
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"

# manylinux1 wheels
py_3.6_32manylinux1:
MB_PYTHON_VERSION: "3.6"
PLAT: "i686"
MB_ML_VER: "1"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.6_64manylinux1:
MB_PYTHON_VERSION: "3.6"
MB_ML_VER: "1"
py_3.7_32manylinux1:
MB_PYTHON_VERSION: "3.7"
PLAT: "i686"
Expand All @@ -134,8 +108,6 @@ jobs:
name: macOS
vmImage: macOS-10.14
matrix:
py_3.6_64:
MB_PYTHON_VERSION: "3.6"
py_3.7_64:
MB_PYTHON_VERSION: "3.7"
py_3.8_64:
Expand Down