Skip to content

Commit bfa93e8

Browse files
authored
Merge pull request silx-kit#331 from t20100/lazy-clib-config
Build: Fixed strip all embedded filters issue with missing plugin folders; CI: Use macos-13
2 parents 8f64899 + 06a322c commit bfa93e8

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
cibw_build: "cp38-manylinux_x86_64"
3939
- os: windows-2019
4040
cibw_build: "cp38-win_amd64"
41-
- os: macos-12
41+
- os: macos-13
4242
cibw_build: "cp38-macosx_x86_64"
4343
- os: ubuntu-latest
4444
cibw_build: "cp310-manylinux_x86_64"
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- uses: actions/checkout@v4
52-
- uses: pypa/cibuildwheel@v2.16.5
52+
- uses: pypa/cibuildwheel@v2.23.0
5353
env:
5454
MACOSX_DEPLOYMENT_TARGET: "10.13"
5555
CIBW_BUILD_VERBOSITY: 1

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- os: windows-2019
7070
cibw_archs: "auto64"
7171
with_sse2: true
72-
- os: macos-12
72+
- os: macos-13
7373
cibw_archs: "universal2"
7474
with_sse2: true
7575

@@ -79,7 +79,7 @@ jobs:
7979
if: runner.os == 'Linux'
8080
with:
8181
platforms: all
82-
- uses: pypa/cibuildwheel@v2.16.5
82+
- uses: pypa/cibuildwheel@v2.23.0
8383
env:
8484
# Configure hdf5plugin build
8585
HDF5PLUGIN_OPENMP: "False"

setup.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# /*##########################################################################
33
#
4-
# Copyright (c) 2016-2024 European Synchrotron Radiation Facility
4+
# Copyright (c) 2016-2025 European Synchrotron Radiation Facility
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -734,7 +734,8 @@ def get_lz4_clib(field=None):
734734
cflags = ['-O3', '-ffast-math', '-std=gnu99']
735735
cflags += ['/Ox', '/fp:fast']
736736

737-
lz4_dir = glob('src/c-blosc2/internal-complibs/lz4*')[0]
737+
folders = glob('src/c-blosc2/internal-complibs/lz4*')
738+
lz4_dir = folders[0] if folders else "src/no-folder"
738739

739740
config = dict(
740741
sources=glob(f'{lz4_dir}/*.c'),
@@ -815,7 +816,8 @@ def get_zlib_clib(field=None):
815816
cflags = ['-O3', '-ffast-math', '-std=gnu99']
816817
cflags += ['/Ox', '/fp:fast']
817818

818-
zlib_dir = glob('src/c-blosc/internal-complibs/zlib*')[0]
819+
folders = glob('src/c-blosc/internal-complibs/zlib*')
820+
zlib_dir = folders[0] if folders else "src/no-folder"
819821

820822
config = dict(
821823
sources=glob(f'{zlib_dir}/*.c'),
@@ -833,7 +835,8 @@ def get_zstd_clib(field=None):
833835
cflags = ['-O3', '-ffast-math', '-std=gnu99']
834836
cflags += ['/Ox', '/fp:fast']
835837

836-
zstd_dir = glob('src/c-blosc2/internal-complibs/zstd*')[0]
838+
folders = glob('src/c-blosc2/internal-complibs/zstd*')
839+
zstd_dir = folders[0] if folders else "src/no-folder"
837840

838841
config = dict(
839842
sources=glob(f'{zstd_dir}/*/*.c'),

0 commit comments

Comments
 (0)