Skip to content

Commit b593b76

Browse files
kclealkcleal
committed
cibw changes
1 parent bde3651 commit b593b76

File tree

5 files changed

+62
-36
lines changed

5 files changed

+62
-36
lines changed

‎.github/workflows/manylinux.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ jobs:
2020

2121
CIBW_ENVIRONMENT: |
2222
OLD_SKIA=1
23-
BUILD_FREETYPE=1
23+
BUILD_GLFW=1
24+
BUILD_FREETYPE=0
2425
CXXFLAGS+=" -D OLD_SKIA "
2526
CPPFLAGS="-I/usr/local/include"
2627
LDFLAGS="-L/usr/local/lib"
2728
28-
CIBW_ENVIRONMENT_PASS_LINUX: OLD_SKIA CXXFLAGS CPPFLAGS LDFLAGS
29+
CIBW_ENVIRONMENT_PASS_LINUX: OLD_SKIA BUILD_GLFW BUILD_FREETYPE CXXFLAGS CPPFLAGS LDFLAGS
2930
CIBW_BEFORE_ALL_LINUX: bash ci/manylinux-build-deps
30-
CIBW_BEFORE_BUILD_LINUX: pip install pysam>=0.21.0 numpy>=1.19.3 cython>=3.0.0
31+
CIBW_BEFORE_BUILD_LINUX: python -m pip install pysam>=0.23.0 numpy>=1.19.3 cython>=3.0.0
3132
CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel -v repair -w {dest_dir} {wheel}"
3233
CIBW_TEST_COMMAND: bash {package}/ci/manylinux-test {wheel}
3334

‎.github/workflows/manylinux_2_28.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@ jobs:
1919
CIBW_BUILD: "cp310-manylinux* cp311-manylinux* cp312-manylinux* cp313-manylinux*"
2020

2121
CIBW_ENVIRONMENT: |
22-
OLD_SKIA=0
22+
BUILD_GLFW=0
2323
BUILD_FREETYPE=1
2424
CPPFLAGS="-I/usr/local/include"
2525
LDFLAGS="-L/usr/local/lib"
2626
27-
CIBW_ENVIRONMENT_PASS_LINUX: OLD_SKIA CXXFLAGS CPPFLAGS LDFLAGS BUILD_FREETYPE
27+
CIBW_ENVIRONMENT_PASS_LINUX: BUILD_GLFW BUILD_FREETYPE CXXFLAGS CPPFLAGS LDFLAGS
2828
CIBW_BEFORE_ALL_LINUX: bash ci/manylinux-build-deps
29-
CIBW_BEFORE_BUILD_LINUX: pip install pysam>=0.21.0 numpy>=1.19.3 cython>=3.0.0
29+
CIBW_BEFORE_BUILD_LINUX: |
30+
python -m pip install pysam>=0.23.0 numpy>=1.19.3 cython>=3.0.0
31+
echo "Python executable: $(which python)"
32+
python -c "import pysam; print('pysam installed at:', pysam.__file__)"
33+
3034
CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel -v repair -w {dest_dir} {wheel}"
3135
CIBW_TEST_COMMAND: bash {package}/ci/manylinux-test {wheel}
3236

‎ci/manylinux-build-deps‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,39 @@ yum -y install gcc gcc-c++ autoconf openssl-devel libffi libffi-devel zlib-devel
1414
libxkbcommon-devel libXrandr libXrandr-devel libssh2 libs3 \
1515
extra-cmake-modules
1616

17-
yum install -y fontconfig-devel freetype-devel libjpeg-turbo-devel libpng-devel \
17+
yum install -y fontconfig-devel libjpeg-turbo-devel libpng-devel \
1818
libuuid-devel librsvg2-devel \
1919
libX11-devel mesa-libEGL-devel mesa-libGLES-devel \
2020
wayland-devel wayland-protocols-devel \
2121
harfbuzz brotli-devel
2222

2323
# GLFW
24-
#if [[ "$BUILD_GLFW" == "1" ]]; then
25-
curl -L -o glfw-3.4.zip https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip
26-
unzip glfw-3.4.zip > /dev/null 2>&1
27-
cd glfw-3.4
28-
#https://github.com/glfw/glfw/issues/1988
29-
sed -i '1i #define _POSIX_C_SOURCE 199309L' /project/glfw-3.4/src/posix_time.c
30-
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/posix_time.c
31-
32-
sed -i '1i #define _POSIX_C_SOURCE 199309L' /project/glfw-3.4/src/wl_init.c
33-
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/wl_init.c
34-
35-
# https://github.com/FlorianRhiem/pyGLFW/blob/master/Willy-JL-glfw-3.4.0-patch.diff
36-
sed -i '/^#include <linux\/input-event-codes.h>/d' /project/glfw-3.4/src/wl_window.c
37-
sed -i '1i #define _XOPEN_SOURCE 700' /project/glfw-3.4/src/linux_joystick.c
38-
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/linux_joystick.c
39-
40-
cmake -S . -B build && cd build && make
41-
cp ./src/libglfw3.a /usr/local/lib && cp ./src/libglfw3.a /usr/local/lib/libglfw.a
42-
cd ../ && ls
43-
cp -rf include/GLFW /usr/local/include
44-
ls /usr/local/include/
45-
ls /usr/local/include/GLFW/
46-
cd ../
47-
#else
48-
# yum install -y glfw-devel
49-
#fi
24+
if [[ "$BUILD_GLFW" == "1" ]]; then
25+
curl -L -o glfw-3.4.zip https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip
26+
unzip glfw-3.4.zip > /dev/null 2>&1
27+
cd glfw-3.4
28+
#https://github.com/glfw/glfw/issues/1988
29+
sed -i '1i #define _POSIX_C_SOURCE 199309L' /project/glfw-3.4/src/posix_time.c
30+
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/posix_time.c
31+
32+
sed -i '1i #define _POSIX_C_SOURCE 199309L' /project/glfw-3.4/src/wl_init.c
33+
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/wl_init.c
34+
35+
# https://github.com/FlorianRhiem/pyGLFW/blob/master/Willy-JL-glfw-3.4.0-patch.diff
36+
sed -i '/^#include <linux\/input-event-codes.h>/d' /project/glfw-3.4/src/wl_window.c
37+
sed -i '1i #define _XOPEN_SOURCE 700' /project/glfw-3.4/src/linux_joystick.c
38+
sed -i '1i #define _GNU_SOURCE' /project/glfw-3.4/src/linux_joystick.c
39+
40+
cmake -S . -B build && cd build && make
41+
cp ./src/libglfw3.a /usr/local/lib && cp ./src/libglfw3.a /usr/local/lib/libglfw.a
42+
cd ../ && ls
43+
cp -rf include/GLFW /usr/local/include
44+
ls /usr/local/include/
45+
ls /usr/local/include/GLFW/
46+
cd ../
47+
else
48+
yum install -y glfw-devel
49+
fi
5050

5151
# libdeflate
5252
pwd
@@ -68,7 +68,11 @@ cd ../
6868

6969
# freetype - build both static and shared
7070
if [ -n "$BUILD_FREETYPE" ]; then
71-
pwd
71+
72+
echo "Removing system FreeType packages..."
73+
yum remove -y freetype freetype-devel || true
74+
rm -f /usr/lib64/libfreetype.so* /lib64/libfreetype.so* || true
75+
7276
curl -L -o freetype.tar.xz https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
7377
ls -lh
7478
tar -xvf freetype.tar.xz > /dev/null 2>&1 && rm freetype.tar.xz
@@ -86,6 +90,8 @@ if [ -n "$BUILD_FREETYPE" ]; then
8690
cp /usr/local/lib/libfreetype.a /usr/local/lib/
8791

8892
cd ../
93+
else
94+
yum install -y freetype-devel
8995
fi
9096

9197
pwd

‎meson.build‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,21 @@ libgw_stamp = custom_target('build_gw',
6666
# -----------------------------------------------------------------------------
6767
numpy_dep = dependency('numpy')
6868

69+
debug_cmd = run_command(py, ['-c', '''
70+
import sys
71+
print("Python path:", sys.executable)
72+
print("Python version:", sys.version)
73+
try:
74+
import pysam
75+
print("pysam found at:", pysam.__file__)
76+
print("pysam version:", pysam.__version__)
77+
except ImportError as e:
78+
print("pysam import error:", e)
79+
print("sys.path:", sys.path)
80+
'''], check: false)
81+
message('Debug output:', debug_cmd.stdout())
82+
message('Debug stderr:', debug_cmd.stderr())
83+
6984
pysam_inc_cmd = run_command(py, ['-c', '''
7085
import pysam, sys
7186
inc = pysam.get_include()

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ requires = [
44
"meson>=1.1.0",
55
"cython>=3.0.0",
66
"numpy>=1.19.3",
7-
"pysam>=0.21.0",
7+
"pysam>=0.23.0",
88
]
99
build-backend = "mesonpy"
1010

@@ -23,7 +23,7 @@ classifiers = [
2323
"Operating System :: POSIX :: Linux",
2424
"Operating System :: MacOS :: MacOS X",
2525
]
26-
dependencies = [ "numpy>=1.19.3", "pysam>=0.21.0" ]
26+
dependencies = [ "numpy>=1.19.3", "pysam>=0.23.0" ]
2727

2828
[project.optional-dependencies]
2929
test = ["matplotlib", "Flask", "pillow"]

0 commit comments

Comments
 (0)