From 58f0105b328ccd0f8fcc29529ab7e310fe47f98e Mon Sep 17 00:00:00 2001 From: Olli-Pekka Heinisuo Date: Tue, 6 Oct 2020 17:36:15 +0300 Subject: [PATCH] Python 3.9 preparations --- .travis.yml | 128 ++++++++++++++++++++++++++++++++++++++++++++++++- appveyor.yml | 32 +++++++++++++ multibuild | 2 +- pyproject.toml | 4 +- setup.py | 2 + 5 files changed, 163 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f79e190..9b583ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,6 +133,16 @@ jobs: - TEST_DEPENDS=numpy==1.17.3 workspaces: use: brew_cache + - os: osx + language: generic + osx_image: xcode9.4 + env: + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.3 + workspaces: + use: brew_cache # headless builds for MacOS - os: osx @@ -165,6 +175,16 @@ jobs: - TEST_DEPENDS=numpy==1.17.3 workspaces: use: brew_cache + - os: osx + language: generic + osx_image: xcode9.4 + env: + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.3 + workspaces: + use: brew_cache # Contrib builds for MacOS - os: osx @@ -197,6 +217,16 @@ jobs: - TEST_DEPENDS=numpy==1.17.3 workspaces: use: brew_cache + - os: osx + language: generic + osx_image: xcode9.4 + env: + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.3 + workspaces: + use: brew_cache # headless contrib builds for MacOS - os: osx @@ -229,6 +259,16 @@ jobs: - TEST_DEPENDS=numpy==1.17.3 workspaces: use: brew_cache + - os: osx + language: generic + osx_image: xcode9.4 + env: + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.3 + workspaces: + use: brew_cache # default builds for Linux - os: linux @@ -308,11 +348,23 @@ jobs: dist: xenial services: docker env: - - MB_PYTHON_VERSION=3.8 + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.3 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 - PLAT=i686 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 - - TEST_DEPENDS=numpy==1.17.3 + - TEST_DEPENDS=numpy==1.19.3 - USE_CCACHE=0 cache: directories: $HOME/.ccache @@ -390,6 +442,30 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.3 + cache: + directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=i686 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.3 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # contrib builds for Linux - os: linux @@ -464,6 +540,30 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - TEST_DEPENDS=numpy==1.19.3 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + cache: + directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=i686 + - TEST_DEPENDS=numpy==1.19.3 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # headless contrib builds for Linux @@ -539,6 +639,30 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - TEST_DEPENDS=numpy==1.19.3 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + cache: + directories: $HOME/.ccache + - os: linux + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=i686 + - TEST_DEPENDS=numpy==1.19.3 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # The first line is printed in the folding header in Travis output before_install: | diff --git a/appveyor.yml b/appveyor.yml index 3dde3d2..d203b1c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,6 +30,14 @@ environment: ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python39" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 0 + + - PYTHON: "C:/Python39-x64" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python36" ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 0 @@ -54,6 +62,14 @@ environment: ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python39" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 0 + + - PYTHON: "C:/Python39-x64" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 0 + - PYTHON: "C:/Python36" ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 1 @@ -78,6 +94,14 @@ environment: ENABLE_CONTRIB: 0 ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python39" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 1 + + - PYTHON: "C:/Python39-x64" + ENABLE_CONTRIB: 0 + ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python36" ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 1 @@ -102,6 +126,14 @@ environment: ENABLE_CONTRIB: 1 ENABLE_HEADLESS: 1 + - PYTHON: "C:/Python39" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 1 + + - PYTHON: "C:/Python39-x64" + ENABLE_CONTRIB: 1 + ENABLE_HEADLESS: 1 + matrix: fast_finish: true diff --git a/multibuild b/multibuild index c2890dc..8882150 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit c2890dc8dc93f99b0eadd76f87aa181f6aea42da +Subproject commit 8882150df6529658700b66bec124dfb77eefca26 diff --git a/pyproject.toml b/pyproject.toml index 7522b5e..ba57753 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ "setuptools", "wheel", "scikit-build", "cmake", "pip", - "numpy==1.11.3; python_version=='3.5'", "numpy==1.13.3; python_version=='3.6'", "numpy==1.14.5; python_version=='3.7'", - "numpy==1.17.3; python_version>='3.8'" + "numpy==1.17.3; python_version>='3.8'", + "numpy==1.19.3; python_version>='3.8'" ] \ No newline at end of file diff --git a/setup.py b/setup.py index 86a7667..7f52501 100644 --- a/setup.py +++ b/setup.py @@ -235,9 +235,11 @@ def main(): "Operating System :: Unix", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: C++", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Scientific/Engineering", -- GitLab