diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 177f1c0289..ed57c1b3ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,28 +88,47 @@ jobs: # 0.15.0: CMake: Fix Python Install Directory # https://github.com/openPMD/openPMD-api/pull/1393 - - name: Download Patch 1/1 + - name: Download Patch 1/4 uses: suisei-cn/actions-download-file@v1 - id: adiosbuild + id: patch1 with: url: "https://github.com/ax3l/openPMD-api/commit/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch" target: src/.patch/ # 0.15.0: macOS AppleClang12 Fixes # https://github.com/openPMD/openPMD-api/pull/1395 - - name: Download Patch 2/2 + - name: Download Patch 2/4 uses: suisei-cn/actions-download-file@v1 - id: setupversion + id: patch2 with: url: "https://github.com/ax3l/openPMD-api/commit/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch" target: src/.patch/ + # 0.15.0: Fix: Artifact Placement in Windows Wheels + # https://github.com/openPMD/openPMD-api/pull/1400 + - name: Download Patch 3/4 + uses: suisei-cn/actions-download-file@v1 + id: patch3 + with: + url: "https://github.com/ax3l/openPMD-api/commit/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch" + target: src/.patch/ + + # 0.15.0.post1 bump + - name: Download Patch 4/4 + uses: suisei-cn/actions-download-file@v1 + id: setupversion + with: + url: "https://gist.githubusercontent.com/ax3l/5e83edefe4b05cf6aa2a971649285fe0/raw/b510a363aac6b68651ec8081efbb40cb3bda1d4b/0001-Bump-setup.py.patch" + target: src/.patch/ + - name: Apply Patches run: | python -m pip install "patch==1.*" cd src python -m patch .patch/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch python -m patch .patch/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch + python -m patch .patch/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch + python -m patch .patch/0001-Bump-setup.py.patch - name: Build wheel env: diff --git a/.travis.yml b/.travis.yml index c46df136fd..6fe7b89564 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: python +python: + - "3.9" branches: only: @@ -128,6 +130,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/ + - python -m pip install --upgrade pip setuptools wheel - python -m pip install cibuildwheel==2.12.1 # twine & cryptography: see # https://github.com/scikit-build/cmake-python-distributions/blob/4730aeee240917303f293dffc89a8d8d5a4787c4/requirements-deploy.txt @@ -141,9 +144,13 @@ before_script: - cd src/.patch - curl -sOL https://github.com/ax3l/openPMD-api/commit/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch - curl -sOL https://github.com/ax3l/openPMD-api/commit/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch + - curl -sOL https://github.com/ax3l/openPMD-api/commit/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch + - curl -sOL https://gist.githubusercontent.com/ax3l/5e83edefe4b05cf6aa2a971649285fe0/raw/b510a363aac6b68651ec8081efbb40cb3bda1d4b/0001-Bump-setup.py.patch - cd .. - - python3 -m patch .patch/dfd65f23af7f907851d44ceb9e3aebdd05b4045f.patch + - python3 -m patch .patch/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch - python3 -m patch .patch/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch + - python3 -m patch .patch/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch + - python3 -m patch .patch/0001-Bump-setup.py.patch - cd .. script: