From e542aa13e156ec0b9e50cd4f62b7f41fc8d1ce8b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 4 Nov 2021 11:07:49 -0700 Subject: [PATCH 1/7] Apply cibuildwheel docker network fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b1fcb85f7..fa628b0a5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ jobs: install: - git clone --branch ${OPENPMD_GIT_REF} --depth 1 https://github.com/openPMD/openPMD-api.git src - cp library_builders.sh src/.github/ - - python3 -m pip install cibuildwheel==2.0.1 + - python3 -m pip install git+https://github.com/ax3l/cibuildwheel.git@fix-ppc64leNetworkTravis # twine & cryptography: see # https://github.com/scikit-build/cmake-python-distributions/blob/4730aeee240917303f293dffc89a8d8d5a4787c4/requirements-deploy.txt # https://github.com/pyca/cryptography/issues/6086 From b4eac19746a4ad0b5b8a6f82281183df40739db0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 4 Nov 2021 13:25:26 -0700 Subject: [PATCH 2/7] Skip for now: Python 3.10 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa628b0a5b..1af3f2ac11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,13 +46,13 @@ jobs: dist: focal env: - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp38-* cp39-*" + - CIBW_SKIP="cp38-* cp39-* cp310-*" - services: docker arch: ppc64le dist: focal env: - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp36-* cp37-*" + - CIBW_SKIP="cp36-* cp37-* cp310-*" # perform a linux S390X build # blocked by https://github.com/GTkorvo/dill/issues/15 From db12c592466e3438009d4ed3ae2c3179c67018db Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 4 Nov 2021 15:33:48 -0700 Subject: [PATCH 3/7] PPC64l: Skip musllinux (no "yum") Just need to update "yum" install logic, I guess. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1af3f2ac11..6f5cc8114f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,13 +46,13 @@ jobs: dist: focal env: - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp38-* cp39-* cp310-*" + - CIBW_SKIP="cp38-* cp39-* cp310-* *-musllinux_*" - services: docker arch: ppc64le dist: focal env: - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp36-* cp37-* cp310-*" + - CIBW_SKIP="cp36-* cp37-* cp310-* *-musllinux_*" # perform a linux S390X build # blocked by https://github.com/GTkorvo/dill/issues/15 From 409ef7fa5b6409d32d4e4dc277fcecef51a086b3 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 8 Nov 2021 16:30:49 -0800 Subject: [PATCH 4/7] Add pre-commit scripts --- .pre-commit-config.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..50b60cdebf --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,40 @@ +# To use: +# +# pre-commit run -a +# +# Or: +# +# pre-commit install # (runs every time you commit in git) +# +# To update this file: +# +# pre-commit autoupdate +# +# See https://pre-commit.com for more information + +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.4.0 + hooks: + - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] + - id: end-of-file-fixer + - id: mixed-line-ending + - id: check-json + - id: check-toml + - id: check-yaml + - id: check-added-large-files +# - id: fix-encoding-pragma +# exclude: ^noxfile.py$ + +#- repo: https://github.com/asottile/pyupgrade +# rev: v2.29.0 +# hooks: +# - id: pyupgrade + +# Changes tabs to spaces +- repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.1.10 + hooks: + - id: remove-tabs From c4a203115c621df32dfede5fd1beebeee3a71fd5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:55:48 +0000 Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- library_builders.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library_builders.bat b/library_builders.bat index 1ac68d6a23..039ecfab70 100644 --- a/library_builders.bat +++ b/library_builders.bat @@ -127,7 +127,7 @@ exit /b 0 -DBUILD_TESTING=OFF ^ -DBUILD_UTILITIES=OFF ^ -DZFP_WITH_OPENMP=OFF - + if errorlevel 1 exit 1 cmake --build build-zfp --parallel %CPU_COUNT% From a36d1cab4843f6b7a9b121d903f07aec596c6c6d Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 14 Dec 2021 15:01:52 -0800 Subject: [PATCH 6/7] Skip: Python 3.10 & Musl - Python 3.10: In next patch release - Musl: needs alternative to `yum` in `library_builders.sh` --- .github/workflows/build.yml | 4 +++- .travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 465d6b0796..f750d15096 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,9 @@ jobs: # typename T = lib::type_pack_element_t, # (3) Disable PyPy (manylinux image: yum repo issues) # https://github.com/pypa/manylinux/issues/899 - CIBW_SKIP: "*-win32 *-manylinux_i686 pp*-manylinux*" + # (4) musllinux: requires alternative to "yum" in library_builders.sh + # (5) CPython 3.10: requires 0.14.4+ (https://github.com/openPMD/openPMD-api/pull/1139) + CIBW_SKIP: "*-win32 *-manylinux_i686 pp*-manylinux* *-musllinux_* cp310-*" CIBW_ARCHS: "${{ matrix.arch }}" CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6" # Install dependencies diff --git a/.travis.yml b/.travis.yml index 6f5cc8114f..c2713afeb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,19 +26,19 @@ jobs: dist: focal env: - CIBW_BUILD="*_aarch64" - - CIBW_SKIP="cp38-* cp39-* pp36-* pp37-*" + - CIBW_SKIP="cp38-* cp39-* pp36-* pp37-* cp310-* *-musllinux_*" - services: docker arch: arm64 dist: focal env: - CIBW_BUILD="*_aarch64" - - CIBW_SKIP="cp36-* cp37-* pp36-* pp37-*" + - CIBW_SKIP="cp36-* cp37-* pp36-* pp37-* cp310-* *-musllinux_*" - services: docker arch: arm64 dist: focal env: - CIBW_BUILD="*_aarch64" - - CIBW_SKIP="cp38-* cp39-* cp36-* cp37-*" + - CIBW_SKIP="cp38-* cp39-* cp36-* cp37-* cp310-* *-musllinux_*" # perform a linux PPC64LE build - services: docker From 1915f99e8363d1a5a838da8125b63b49aec14458 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 15 Dec 2021 15:52:57 -0800 Subject: [PATCH 7/7] Travis PPC builds: Split 1 per build Dependencies: 1500s (25min) Wheel: 1000s (17min) Total time available: 50min --- .travis.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2713afeb7..0cd684bb3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,14 +45,27 @@ jobs: arch: ppc64le dist: focal env: - - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp38-* cp39-* cp310-* *-musllinux_*" + - CIBW_BUILD="cp36-manylinux_ppc64le" - services: docker arch: ppc64le dist: focal env: - - CIBW_BUILD="*_ppc64le" - - CIBW_SKIP="cp36-* cp37-* cp310-* *-musllinux_*" + - CIBW_BUILD="cp37-manylinux_ppc64le" + - services: docker + arch: ppc64le + dist: focal + env: + - CIBW_BUILD="cp38-manylinux_ppc64le" + - services: docker + arch: ppc64le + dist: focal + env: + - CIBW_BUILD="cp39-manylinux_ppc64le" +# - services: docker +# arch: ppc64le +# dist: focal +# env: +# - CIBW_BUILD="cp310-manylinux_ppc64le" # perform a linux S390X build # blocked by https://github.com/GTkorvo/dill/issues/15