Skip to content

Commit 589ec1b

Browse files
MizuxMizux
committed
multiple fixes
1 parent 4ccadfe commit 589ec1b

File tree

11 files changed

+123
-57
lines changed

11 files changed

+123
-57
lines changed

‎.github/workflows/amd64_linux.yml

+17-18
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,32 @@ jobs:
1313
{generator: "Ninja", config: "Release"},
1414
{generator: "Ninja Multi-Config", config: "Release"},
1515
]
16+
python: [
17+
{version: "3.9"},
18+
{version: "3.10"},
19+
{version: "3.11"},
20+
{version: "3.12"},
21+
{version: "3.13"},
22+
]
1623
fail-fast: false
17-
name: Linux • ${{ matrix.cmake.generator }}
24+
name: Linux•${{ matrix.cmake.generator }}•Py${{ matrix.python.version }}
1825
runs-on: ubuntu-latest
1926
steps:
2027
- uses: actions/checkout@v4
2128
- name: Install Ninja
2229
run: |
2330
sudo apt-get update
2431
sudo apt-get install ninja-build
25-
- name: Uninstall preinstalled swig3.0
32+
- name: Swig install
2633
run: |
27-
swig -version;
28-
sudo apt remove -y swig swig3.0
29-
- name: Install SWIG 4.3.0
30-
run: |
31-
wget "https://github.com/swig/swig/archive/refs/tags/v4.3.0.tar.gz" -O swig-4.3.0.tar.gz;
32-
tar xvf swig-4.3.0.tar.gz;
33-
rm swig-4.3.0.tar.gz;
34-
cd swig-4.3.0;
35-
./autogen.sh;
36-
./configure --prefix=/usr;
37-
make -j8;
38-
sudo make install;
39-
cd ..;
40-
rm -rf swig-4.3.0;
41-
- name: Check swig
42-
run: swig -version
34+
sudo apt install -y swig
35+
swig -version
36+
- name: Setup Python
37+
uses: actions/setup-python@v5
38+
with:
39+
python-version: ${{ matrix.python.version }}
40+
- name: Update Path
41+
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
4342
- name: Check cmake
4443
run: cmake --version
4544
- name: Configure

‎.github/workflows/amd64_macos.yml

+21-6
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,33 @@ jobs:
99
strategy:
1010
matrix:
1111
cmake: [
12-
{generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
13-
{generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
12+
{name: "Xcode", generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
13+
{name: "Make", generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
14+
]
15+
python: [
16+
{version: "3.9"},
17+
{version: "3.10"},
18+
{version: "3.11"},
19+
{version: "3.12"},
20+
{version: "3.13"},
1421
]
1522
fail-fast: false
16-
name: MacOS • ${{ matrix.cmake.generator }}
23+
name: MacOS•${{ matrix.cmake.name }}•Py${{ matrix.python.version }}
1724
runs-on: macos-13 # last macos intel based runner
1825
steps:
1926
- uses: actions/checkout@v4
2027
- name: Swig install
21-
run: brew install swig
22-
- name: Check swig
23-
run: swig -version
28+
run: |
29+
brew install swig
30+
swig -version
31+
- name: Setup Python
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: ${{ matrix.python.version }}
35+
- name: Update Path
36+
run: |
37+
echo "$HOME/Library/Python/${{ matrix.python.version }}/bin" >> $GITHUB_PATH
38+
echo "$HOME/.local/bin" >> $GITHUB_PATH
2439
- name: Check cmake
2540
run: cmake --version
2641
- name: Configure

‎.github/workflows/amd64_windows.yml

+19-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@ jobs:
99
strategy:
1010
matrix:
1111
cmake: [
12-
{generator: "Visual Studio 17 2022", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL},
13-
{generator: "Visual Studio 17 2022", config: Debug, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL},
12+
{name: "VS22", generator: "Visual Studio 17 2022", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL},
13+
{name: "VS22", generator: "Visual Studio 17 2022", config: Debug, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL},
14+
]
15+
python: [
16+
{version: "3.9", dir: Python309},
17+
{version: "3.10", dir: Python310},
18+
{version: "3.11", dir: Python311},
19+
{version: "3.12", dir: Python312},
20+
{version: "3.13", dir: Python313},
1421
]
1522
fail-fast: false
16-
name: Windows • ${{ matrix.cmake.generator }} (${{ matrix.cmake.config }})
23+
name: Windows•${{ matrix.cmake.name }}(${{ matrix.cmake.config }})•Py${{ matrix.python.version }}
1724
runs-on: windows-latest
1825
env:
1926
CTEST_OUTPUT_ON_FAILURE: 1
@@ -26,6 +33,15 @@ jobs:
2633
echo "$((Get-Item .).FullName)/swigwin-4.3.0" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
2734
- name: Check swig
2835
run: swig -version
36+
- uses: actions/setup-python@v5
37+
with:
38+
python-version: ${{ matrix.python.version }}
39+
- name: Install python3
40+
run: python3 -m pip install --user mypy setuptools wheel numpy pandas
41+
- name: Add Python binaries to path
42+
run: >
43+
echo "$((Get-Item ~).FullName)/AppData/Roaming/Python/${{ matrix.python.dir }}/Scripts" |
44+
Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
2945
- name: Check cmake
3046
run: |
3147
cmake --version

‎.github/workflows/arm64_macos.yml

+20-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,33 @@ jobs:
99
strategy:
1010
matrix:
1111
cmake: [
12-
{generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
13-
{generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
12+
{name: "Xcode", generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
13+
{name: "Make", generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
14+
]
15+
python: [
16+
{version: "3.9"},
17+
{version: "3.10"},
18+
{version: "3.11"},
19+
{version: "3.12"},
20+
{version: "3.13"},
1421
]
1522
fail-fast: false
1623
name: MacOS • ${{ matrix.cmake.generator }}
1724
runs-on: macos-latest # macos M1 based runner
1825
steps:
1926
- uses: actions/checkout@v4
2027
- name: Swig install
21-
run: brew install swig
22-
- name: Check swig
23-
run: swig -version
28+
run: |
29+
brew install swig
30+
swig -version
31+
- name: Setup Python
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: ${{ matrix.python.version }}
35+
- name: Update Path
36+
run: |
37+
echo "$HOME/Library/Python/${{ matrix.python.version }}/bin" >> $GITHUB_PATH
38+
echo "$HOME/.local/bin" >> $GITHUB_PATH
2439
- name: Check cmake
2540
run: cmake --version
2641
- name: Configure

‎ci/docker/almalinux/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ RUN dnf -y update \
2626
&& cd .. \
2727
&& rm -rf swig-4.3.0
2828

29+
RUN dnf -y update \
30+
&& dnf -y install python3-devel python3-pip python3-numpy \
31+
&& dnf clean all \
32+
&& rm -rf /var/cache/dnf
33+
RUN python3 -m pip install mypy
34+
2935
# Add the library src to our build env
3036
FROM env AS devel
3137
WORKDIR /home/project

‎ci/docker/debian/Dockerfile

+14-9
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ FROM debian:unstable AS env
44

55
# Install system build dependencies
66
ENV PATH=/usr/local/bin:$PATH
7-
RUN apt-get update -qq \
8-
&& apt-get install -yq git wget libssl-dev build-essential cmake \
9-
&& apt-get clean \
7+
RUN apt update -qq \
8+
&& apt install -yq git wget libssl-dev build-essential cmake \
9+
&& apt clean \
1010
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1111

1212
# Install swig
13-
RUN apt-get update -qq \
14-
&& apt-get install -yq swig \
15-
&& apt-get clean \
13+
RUN apt update -qq \
14+
&& apt install -yq swig \
15+
&& apt clean \
1616
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1717

1818
# Install Python
19-
RUN apt-get update -qq \
20-
&& apt-get install -yq python3-dev python3-pip python3-venv \
21-
&& apt-get clean \
19+
RUN apt update -qq \
20+
&& apt install -yq \
21+
python3-dev python3-pip python3-venv \
22+
python3-setuptools python3-wheel \
23+
python3-numpy python3-pandas \
24+
&& apt clean \
2225
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
26+
RUN python3 -m pip install --break-system-package \
27+
mypy
2328

2429
# Add the library src to our build env
2530
FROM env AS devel

‎ci/docker/fedora/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM fedora:latest AS env
66
ENV PATH=/usr/local/bin:$PATH
77
RUN dnf -y update \
88
&& dnf -y install git wget \
9-
&& dnf -y groupinstall "Development Tools" \
9+
&& dnf -y @development-tools \
1010
&& dnf -y install gcc-c++ cmake \
1111
&& dnf clean all
1212

‎ci/docker/opensuse/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ RUN zypper update -y \
1616

1717
# Install Python
1818
RUN zypper update -y \
19-
&& zypper install -y python3 python3-devel \
20-
python3-pip python311-wheel \
19+
&& zypper install -y python311 python311-devel \
20+
python311-pip python311-wheel python311-setuptools \
2121
&& zypper clean -a
22+
RUN python3.11 -m pip install --break-system-packages \
23+
mypy
2224

2325
# Add the library src to our build env
2426
FROM env AS devel

‎ci/docker/rockylinux/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ RUN dnf -y update \
2626
&& cd .. \
2727
&& rm -rf swig-4.3.0
2828

29+
RUN dnf -y update \
30+
&& dnf -y install python3-devel python3-pip python3-numpy \
31+
&& dnf clean all \
32+
&& rm -rf /var/cache/dnf
33+
RUN python3 -m pip install mypy
34+
2935
# Add the library src to our build env
3036
FROM env AS devel
3137
WORKDIR /home/project

‎ci/docker/ubuntu/Dockerfile

+7-4
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ RUN apt update -q \
88
&& DEBIAN_FRONTEND=noninteractive apt install -yq \
99
git wget libssl-dev \
1010
build-essential cmake \
11-
&& apt-get clean \
11+
&& apt clean \
1212
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1313

1414
# Install swig
1515
RUN apt update -q \
1616
&& apt install -yq swig \
17-
&& apt-get clean \
17+
&& apt clean \
1818
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1919

2020
# Install Python
2121
RUN apt update -q \
22-
&& apt install -yq python3-dev python3-pip python3-venv \
23-
&& apt-get clean \
22+
&& apt install -yq \
23+
python3-dev python3-pip python3-venv \
24+
python3-setuptools python3-wheel \
25+
python3-numpy python3-pandas \
26+
&& apt clean \
2427
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2528

2629
FROM env AS devel

‎cmake/python.cmake

+8-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(${SWIG_VERSION} VERSION_GREATER_EQUAL 4)
1010
list(APPEND CMAKE_SWIG_FLAGS "-doxygen")
1111
endif()
1212

13-
if(UNIX AND NOT APPLE)
13+
if(UNIX AND NOT APPLE AND NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD"))
1414
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
1515
list(APPEND CMAKE_SWIG_FLAGS "-DSWIGWORDSIZE64")
1616
else()
@@ -59,7 +59,7 @@ function(search_python_module)
5959
OUTPUT_VARIABLE MODULE_VERSION
6060
ERROR_QUIET
6161
OUTPUT_STRIP_TRAILING_WHITESPACE
62-
)
62+
)
6363
endif()
6464
if(${_RESULT} STREQUAL "0")
6565
message(STATUS "Found python module: \"${MODULE_NAME}\" (found version \"${MODULE_VERSION}\")")
@@ -69,7 +69,8 @@ function(search_python_module)
6969
execute_process(
7070
COMMAND ${Python3_EXECUTABLE} -m pip install --user ${MODULE_PACKAGE}
7171
OUTPUT_STRIP_TRAILING_WHITESPACE
72-
)
72+
COMMAND_ERROR_IS_FATAL ANY
73+
)
7374
else()
7475
message(FATAL_ERROR "Can't find python module: \"${MODULE_NAME}\", please install it using your system package manager.")
7576
endif()
@@ -113,11 +114,9 @@ if(BUILD_TESTING)
113114
#search_python_module(NAME virtualenv PACKAGE virtualenv)
114115
# venv not working on github windows runners
115116
search_python_internal_module(NAME venv)
116-
117117
# Testing using a vitual environment
118118
#set(VENV_EXECUTABLE ${Python3_EXECUTABLE} -m virtualenv)
119119
set(VENV_EXECUTABLE ${Python3_EXECUTABLE} -m venv)
120-
121120
set(VENV_DIR ${CMAKE_CURRENT_BINARY_DIR}/python/venv)
122121
if(WIN32)
123122
set(VENV_Python3_EXECUTABLE ${VENV_DIR}/Scripts/python.exe)
@@ -186,7 +185,7 @@ file(GENERATE
186185
# COMMAND ${CMAKE_COMMAND} -E copy setup.py setup.py
187186
# WORKING_DIRECTORY python)
188187

189-
# Look for python module wheel
188+
# Look for python modules
190189
search_python_module(
191190
NAME setuptools
192191
PACKAGE setuptools)
@@ -195,7 +194,7 @@ search_python_module(
195194
PACKAGE wheel)
196195

197196
add_custom_command(
198-
OUTPUT python/dist/timestamp
197+
OUTPUT python/dist_timestamp
199198
COMMAND ${CMAKE_COMMAND} -E remove_directory dist
200199
COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_PROJECT}/.libs
201200
# Don't need to copy static lib on Windows.
@@ -213,7 +212,7 @@ add_custom_command(
213212
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:pyFooBar> ${PYTHON_PROJECT}/foobar
214213
#COMMAND ${Python3_EXECUTABLE} setup.py bdist_egg bdist_wheel
215214
COMMAND ${Python3_EXECUTABLE} setup.py bdist_wheel
216-
COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/dist/timestamp
215+
COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/dist_timestamp
217216
MAIN_DEPENDENCY
218217
python/setup.py.in
219218
DEPENDS
@@ -233,7 +232,7 @@ add_custom_command(
233232
# Main Target
234233
add_custom_target(python_package ALL
235234
DEPENDS
236-
python/dist/timestamp
235+
python/dist_timestamp
237236
WORKING_DIRECTORY python)
238237

239238
if(BUILD_TESTING)

0 commit comments

Comments
 (0)