Skip to content

Commit 1f4e30d

Browse files
authored
Wheels: 0.16.1 (#1712)
* Wheels: 0.16.1 Update the cibuildwheel reference tracking to the 0.16.1 release. * ADIOS 2.10.1 -> 2.10.2 * macOS 12 -> 13
1 parent 851296b commit 1f4e30d

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

.github/workflows/build.yml

+27-27
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
CMAKE_GENERATOR: "Visual Studio 16 2019"
4141
CMAKE_GENERATOR_PLATFORM: "Win32"
4242

43-
- os: macos-12
43+
- os: macos-13
4444
arch: "x86_64"
4545
env:
4646
MACOSX_DEPLOYMENT_TARGET: 11.0
4747

4848
# Apple Silicon M1/arm64/aarch64 builds:
4949
# https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
5050
# https://github.com/pypa/cibuildwheel/pull/704
51-
- os: macos-12
51+
- os: macos-13
5252
arch: "arm64"
5353
env:
5454
CMAKE_OSX_ARCHITECTURES: "arm64"
@@ -60,7 +60,7 @@ jobs:
6060
# https://developer.apple.com/documentation/apple-silicon/building-a-universal-macos-binary
6161
# ADIOS1 tricky to build and HDF5 even with CMake as well (as of 1.12)
6262
# We could build them twice and use `lipo` to combine the lib artifacts.
63-
#- os: macos-12
63+
#- os: macos-13
6464
# arch: "universal2"
6565
# env:
6666
# CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/checkout@v4
7171
with:
7272
path: 'src'
73-
ref: '0.16.0'
73+
ref: '0.16.1'
7474

7575
- uses: actions/checkout@v4
7676
with:
@@ -86,29 +86,29 @@ jobs:
8686
python -m pip install --upgrade pip setuptools wheel
8787
python -m pip install cibuildwheel==2.21.2
8888
89-
# Patch: Fix versioning
90-
- name: Download Patch 1/2
91-
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
92-
id: setupversion
93-
with:
94-
url: "https://github.com/openPMD/openPMD-api/pull/1680.patch"
95-
target: src/.patch/
96-
97-
# Patch: PYBIND11_FINDPYTHON=ON
98-
- name: Download Patch 2/2
99-
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
100-
id: setupfindpython
101-
with:
102-
url: "https://github.com/openPMD/openPMD-api/pull/1684.patch"
103-
target: src/.patch/
104-
105-
- name: Apply Patches
106-
run: |
107-
cd src
108-
git apply --exclude=.github/workflows/windows.yml .patch/1680.patch
109-
git apply --exclude=cmake/dependencies/pybind11.cmake .patch/1684.patch
110-
git fetch
111-
git apply --exclude=setup.py -3 .patch/1684.patch
89+
# # Patch: Fix versioning
90+
# - name: Download Patch 1/2
91+
# uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
92+
# id: setupversion
93+
# with:
94+
# url: "https://github.com/openPMD/openPMD-api/pull/1680.patch"
95+
# target: src/.patch/
96+
97+
# # Patch: PYBIND11_FINDPYTHON=ON
98+
# - name: Download Patch 2/2
99+
# uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
100+
# id: setupfindpython
101+
# with:
102+
# url: "https://github.com/openPMD/openPMD-api/pull/1684.patch"
103+
# target: src/.patch/
104+
105+
# - name: Apply Patches
106+
# run: |
107+
# cd src
108+
# git apply --exclude=.github/workflows/windows.yml .patch/1680.patch
109+
# git apply --exclude=cmake/dependencies/pybind11.cmake .patch/1684.patch
110+
# git fetch
111+
# git apply --exclude=setup.py -3 .patch/1684.patch
112112

113113
- name: Build wheel
114114
env:

.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ branches:
88

99
env:
1010
global:
11-
- OPENPMD_GIT_REF="0.16.0"
11+
- OPENPMD_GIT_REF="0.16.1"
1212

1313
- CIBW_PROJECT_REQUIRES_PYTHON=">=3.9"
1414
# Install dependencies on Linux and OSX
@@ -154,14 +154,14 @@ install:
154154
- python -m pip install patch
155155

156156
# Download & Apply Patches
157-
before_script:
158-
- mkdir -p src/.patch
159-
- cd src/.patch
160-
- curl -sOL https://github.com/openPMD/openPMD-api/pull/1680.patch
161-
- cd ..
162-
- ls -hal .patch/
163-
- git apply --exclude=.github/workflows/windows.yml .patch/1680.patch
164-
- cd ..
157+
#before_script:
158+
# - mkdir -p src/.patch
159+
# - cd src/.patch
160+
# - curl -sOL https://github.com/openPMD/openPMD-api/pull/1680.patch
161+
# - cd ..
162+
# - ls -hal .patch/
163+
# - git apply --exclude=.github/workflows/windows.yml .patch/1680.patch
164+
# - cd ..
165165

166166
script:
167167
- cd src

library_builders.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ exit /b 0
1717

1818
:build_adios2
1919
if exist adios2-stamp exit /b 0
20-
curl -sLo adios2-2.10.1.zip ^
21-
https://github.com/ornladios/ADIOS2/archive/v2.10.1.zip
22-
powershell Expand-Archive adios2-2.10.1.zip -DestinationPath dep-adios2
20+
curl -sLo adios2-2.10.2.zip ^
21+
https://github.com/ornladios/ADIOS2/archive/v2.10.2.zip
22+
powershell Expand-Archive adios2-2.10.2.zip -DestinationPath dep-adios2
2323

2424
cmake --version
2525

26-
cmake -S dep-adios2/ADIOS2-2.10.1 -B build-adios2 ^
26+
cmake -S dep-adios2/ADIOS2-2.10.2 -B build-adios2 ^
2727
-DCMAKE_BUILD_TYPE=Release ^
2828
-DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE ^
2929
-DBUILD_SHARED_LIBS=OFF ^

library_builders.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ function build_adios1 {
103103
function build_adios2 {
104104
if [ -e adios2-stamp ]; then return; fi
105105

106-
curl -sLo adios2-2.10.1.tar.gz \
107-
https://github.com/ornladios/ADIOS2/archive/v2.10.1.tar.gz
106+
curl -sLo adios2-2.10.2.tar.gz \
107+
https://github.com/ornladios/ADIOS2/archive/v2.10.2.tar.gz
108108
file adios2*.tar.gz
109109
tar -xzf adios2*.tar.gz
110110
rm adios2*.tar.gz

0 commit comments

Comments
 (0)