Skip to content

Commit a3fd35a

Browse files
philippeVerneyphilippeVerney
committed
Bump to FESAPI 2.14.0.0
1 parent 3a5d1ad commit a3fd35a

3 files changed

Lines changed: 20 additions & 18 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
cmake --install .
5353
- name: FESAPI install
5454
run: |
55-
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.13.0.0/fesapi2_13_0_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
55+
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.14.0.0/fesapi2_14_0_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
5656
7z x ${{ runner.temp }}\fesapi.zip -o${{ runner.temp }}
5757
- name: CMake build and install
5858
run: |
5959
cd ${{ github.workspace }}/..
6060
mkdir build
6161
cd build
62-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_13_0_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
62+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_14_0_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
6363
cmake --build . --config Release -j2
6464
ubuntu-22:
6565
runs-on: ubuntu-22.04
@@ -148,7 +148,7 @@ jobs:
148148
sudo apt install -y ${{ matrix.xcc_pkg }} libhdf5-dev libminizip-dev libboost-all-dev
149149
- name: FESAPI install
150150
run: |
151-
git clone --branch v2.13.0.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
151+
git clone --branch v2.14.0.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
152152
cd ${{ runner.temp }}
153153
mkdir fesapi-build
154154
cd fesapi-build
@@ -175,7 +175,7 @@ jobs:
175175
cd ${{ github.workspace }}/..
176176
mkdir build
177177
cd build
178-
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.13.0.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
178+
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.14.0.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
179179
cmake --build . --config Release -j2
180180
build_wheels_windows:
181181
name: Build wheels on windows-latest
@@ -194,12 +194,12 @@ jobs:
194194
CIBW_BEFORE_ALL: >
195195
%VCPKG_INSTALLATION_ROOT%\vcpkg install boost-uuid minizip hdf5[zlib] &&
196196
cd ${{ runner.temp }} &&
197-
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.13.0.0.tar.gz', '${{ runner.temp }}\fesapi-2.13.0.0.tar.gz')" &&
198-
7z x ${{ runner.temp }}\fesapi-2.13.0.0.tar.gz -o${{ runner.temp }} &&
199-
7z x ${{ runner.temp }}\fesapi-2.13.0.0.tar -o${{ runner.temp }} &&
197+
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.tar.gz', '${{ runner.temp }}\fesapi-2.14.0.0.tar.gz')" &&
198+
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar.gz -o${{ runner.temp }} &&
199+
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar -o${{ runner.temp }} &&
200200
mkdir fesapi-build &&
201201
cd fesapi-build &&
202-
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.13.0.0 &&
202+
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.14.0.0 &&
203203
cmake --build . --config Release -j2 &&
204204
cmake --build . --config Release --target INSTALL &&
205205
%VCPKG_INSTALLATION_ROOT%\vcpkg install openssl boost-beast avro-cpp &&
@@ -243,11 +243,11 @@ jobs:
243243
yum install -y epel-release &&
244244
yum --enablerepo=epel install -y minizip1.2-devel hdf5-devel cmake3 &&
245245
cd / &&
246-
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.13.0.0.zip &&
247-
unzip v2.13.0.0.zip &&
246+
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
247+
unzip v2.14.0.0.zip &&
248248
mkdir fesapi-build &&
249249
cd fesapi-build &&
250-
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.13.0.0 &&
250+
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.14.0.0 &&
251251
cmake3 --build . -j2 --config Release &&
252252
cmake3 --install . &&
253253
cd / &&
@@ -296,9 +296,9 @@ jobs:
296296
# Dont use brew for dependencies https://github.com/pypa/cibuildwheel/issues/1251#issuecomment-1234553537
297297
CIBW_BEFORE_ALL: >
298298
cd ${{ github.workspace }}/.. &&
299-
wget --no-verbose https://archives.boost.io/release/1.88.0/source/boost_1_88_0.tar.gz &&
300-
tar xf boost_1_88_0.tar.gz &&
301-
cd boost_1_88_0 &&
299+
wget --no-verbose https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz &&
300+
tar xf boost_1_87_0.tar.gz &&
301+
cd boost_1_87_0 &&
302302
./bootstrap.sh --prefix=${{ github.workspace }}/../boost-install --with-libraries=filesystem,iostreams,program_options,regex,system &&
303303
./b2 -d0 install &&
304304
git clone https://github.com/F2I-Consulting/Minizip.git ${{ github.workspace }}/../minizip &&
@@ -316,11 +316,11 @@ jobs:
316316
cmake --build . -j2 --config Release &&
317317
cmake --install . &&
318318
cd ${{ github.workspace }}/.. &&
319-
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.13.0.0.zip &&
320-
unzip v2.13.0.0.zip &&
319+
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
320+
unzip v2.14.0.0.zip &&
321321
mkdir fesapi-build &&
322322
cd fesapi-build &&
323-
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.13.0.0 &&
323+
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.14.0.0 &&
324324
cmake --build . -j2 --config Release &&
325325
cmake --install . &&
326326
cd ${{ github.workspace }}/.. &&

‎cmake/pyproject.toml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ keywords = [
4343
]
4444
requires-python = ">=3.8"
4545
dependencies = [
46-
'fesapi==2.13.0',
46+
'fesapi==2.14.0',
4747
]
4848

4949
[project.urls]

‎python/example/etp_client_example.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ def start_etp_server(client_session):
6060
print("Create a FESAPI Dataobject repository to ease access to dataobjects");
6161
repo = fesapi.DataObjectRepository()
6262
hdf_proxy_factory = fetpapi.FesapiHdfProxyFactory(client_session)
63+
print(fetpapi.FesapiHdfProxyFactory.__swigtype__)
64+
print(fesapi.HdfProxyFactory.__swigtype__)
6365
print("Set specialized HdfProxy to deal with ETP DataArray subprotocol")
6466
repo.setHdfProxyFactory(hdf_proxy_factory)
6567

0 commit comments

Comments
 (0)