Skip to content

Commit b15c7b0

Browse files
authored
Merge pull request #487 from RamSaw/fix_mac_os_build
2 parents 16de63d + 64b29b8 commit b15c7b0

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

.github/workflows/versions.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
matrix:
2525
python-version: ["3.10"]
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v2
29+
uses: actions/setup-python@v5
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232
- name: Install python dependencies
@@ -53,16 +53,16 @@ jobs:
5353
max-parallel: 12
5454
matrix:
5555
# TODO: fix for Mac and Windows.
56-
os: [ubuntu-latest]
57-
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
56+
os: [ubuntu-latest, macos-latest]
57+
python-version: ["3.11", "3.12", "3.13", "3.14"]
5858

5959
steps:
6060
- uses: actions/checkout@v4
6161
with:
6262
submodules: true
6363

6464
- name: Set up Python ${{ matrix.python-version }}
65-
uses: actions/setup-python@v2
65+
uses: actions/setup-python@v5
6666
with:
6767
python-version: ${{ matrix.python-version }}
6868

@@ -71,10 +71,6 @@ jobs:
7171
run: |
7272
sudo apt-get update
7373
sudo apt-get install -y protobuf-compiler libprotobuf-dev
74-
- name: Install Protobuf Compiler Mac
75-
if: runner.os == 'macOS'
76-
run: |
77-
brew install protobuf
7874
7975
- name: Install Protobuf Compiler Windows
8076
if: runner.os == 'Windows'
@@ -90,6 +86,7 @@ jobs:
9086
echo "$destinationFolder\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
9187
9288
- name: Verify protoc installation
89+
if: runner.os != 'macOS'
9390
run: protoc --version
9491

9592
- name: Download proto header Windows
@@ -134,7 +131,7 @@ jobs:
134131
- name: Get poetry cache dir
135132
id: poetry-cache
136133
run: |
137-
echo "::set-output name=dir::$(poetry config cache-dir)"
134+
echo "dir=$(poetry config cache-dir)" >> $GITHUB_OUTPUT
138135
139136
- name: poetry cache
140137
uses: actions/cache@v4
@@ -152,7 +149,7 @@ jobs:
152149
- name: Build PyDP macOS
153150
if: runner.os == 'macOS'
154151
run: |
155-
poetry run python setup.py build bdist_wheel --plat-name macosx_10_14_x86_64
152+
poetry run python setup.py build bdist_wheel
156153
157154
- name: Build PyDP Linux / Windows
158155
if: runner.os != 'macOS'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ coverage_report/*
6060
!coverage_report/index.html
6161

6262
.python-version
63+
.venv/

prereqs_mac.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ else
3636
brew install clang-format
3737
fi
3838

39+
# cmake
40+
if command -v cmake &>/dev/null; then
41+
echo "cmake already installed"
42+
else
43+
echo "installing cmake"
44+
brew install cmake
45+
fi
46+
3947
# poetry
4048
echo "Checking for poetry"
4149
if python3 -c "import poetry" &> /dev/null; then

src/bindings/PyDP/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ target_link_libraries(_pydp PUBLIC dp_algorithms dp_protos
5454
)
5555

5656
if(NOT WIN32)
57-
target_compile_options(_pydp PRIVATE -Wno-deprecated-declarations -Wdeprecated-declarations)
57+
target_compile_options(_pydp PRIVATE -Wdeprecated-declarations)
5858
endif()

0 commit comments

Comments
 (0)