From 7705cb6cf92e494538911e052413e5804044e94b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 1 May 2021 17:00:12 +0200 Subject: [PATCH] PyPI version 0.27.0, dropped CentOS5+6 from manilinux builds as STL wasn't compatible with std::unique_ptr anymore --- .travis.yml | 58 ++++++++++++++++++++++++++--------------------------- version.sh | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbe40495a..c9f4e8d3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: matrix: include: # python manylinux packages - - name: "cp39-cp39m-manylinux1_x86_64.whl" + - name: "cp39-cp39m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -15,7 +15,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp39-cp39" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -24,13 +24,13 @@ matrix: directories: - ccache - - name: "cp39-cp39m-manylinux1_i686.whl" + - name: "cp39-cp39m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp39-cp39" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -38,7 +38,7 @@ matrix: directories: - ccache - - name: "cp38-cp38m-manylinux1_x86_64.whl" + - name: "cp38-cp38m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -46,7 +46,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp38-cp38" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -55,13 +55,13 @@ matrix: directories: - ccache - - name: "cp38-cp38m-manylinux1_i686.whl" + - name: "cp38-cp38m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp38-cp38" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -69,7 +69,7 @@ matrix: directories: - ccache - - name: "cp37-cp37m-manylinux1_x86_64.whl" + - name: "cp37-cp37m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -77,7 +77,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp37-cp37m" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -86,13 +86,13 @@ matrix: directories: - ccache - - name: "cp37-cp37m-manylinux1_i686.whl" + - name: "cp37-cp37m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp37-cp37m" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -100,7 +100,7 @@ matrix: directories: - ccache - - name: "cp36-cp36m-manylinux1_x86_64.whl" + - name: "cp36-cp36m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -108,7 +108,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp36-cp36m" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -117,13 +117,13 @@ matrix: directories: - ccache - - name: "cp36-cp36m-manylinux1_i686.whl" + - name: "cp36-cp36m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp36-cp36m" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -131,7 +131,7 @@ matrix: directories: - ccache - - name: "cp35-cp35m-manylinux1_x86_64.whl" + - name: "cp35-cp35m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -139,7 +139,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp35-cp35m" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -148,13 +148,13 @@ matrix: directories: - ccache - - name: "cp35-cp35m-manylinux1_i686.whl" + - name: "cp35-cp35m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp35-cp35m" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -162,7 +162,7 @@ matrix: directories: - ccache - - name: "cp27-cp27mu-manylinux1_x86_64.whl" + - name: "cp27-cp27mu-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -170,7 +170,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp27-cp27mu" - DOCKER_BUILD=true - TEST_IN_HOST=true @@ -179,13 +179,13 @@ matrix: directories: - ccache - - name: "cp27-cp27mu-manylinux1_i686.whl" + - name: "cp27-cp27mu-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp27-cp27mu" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -193,7 +193,7 @@ matrix: directories: - ccache - - name: "cp27-cp27m-manylinux1_x86_64.whl" + - name: "cp27-cp27m-manylinux2014_x86_64.whl" os: linux sudo: true language: python @@ -201,7 +201,7 @@ matrix: services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64" - PY_VERSION="cp27-cp27m" - DOCKER_BUILD=true - TEST_IN_HOST=false # travis's python 2.7 uses ucs4 (mu), so this test fails. @@ -210,13 +210,13 @@ matrix: directories: - ccache - - name: "cp27-cp27m-manylinux1_i686.whl" + - name: "cp27-cp27m-manylinux2014_i686.whl" os: linux sudo: true services: - docker env: - - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - DOCKER_IMAGE="quay.io/pypa/manylinux2014_i686" - PY_VERSION="cp27-cp27m" - DOCKER_BUILD=true - MATRIX_EVAL="" @@ -648,7 +648,7 @@ script: docker run --rm -e DOCKER_IMAGE -e PY_VERSION -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD "/io/ci-scripts/docker/docker_build.sh"; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - cp -a wheelhouse/{klayout-*manylinux1*.whl,*.zip} deploy/dist-pymod/$klayout_version; + cp -a wheelhouse/{klayout-*manylinux2014*.whl,*.zip} deploy/dist-pymod/$klayout_version; if [ "$TEST_IN_HOST" = true ]; then pip install klayout --no-index -f ./wheelhouse; python testdata/pymod/import_db.py; diff --git a/version.sh b/version.sh index a11bd8262..081db679e 100644 --- a/version.sh +++ b/version.sh @@ -5,7 +5,7 @@ KLAYOUT_VERSION="0.27" # The version used for PyPI (don't use variables here!) -KLAYOUT_PYPI_VERSION="0.27" +KLAYOUT_PYPI_VERSION="0.27.0" # The build date KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")