Skip to content

Commit 62d8aac

Browse files
alemuntonialemuntoni
committed
Merge branch 'main' into devel
2 parents b3d8a8d + aeadd92 commit 62d8aac

File tree

6 files changed

+52
-42
lines changed

6 files changed

+52
-42
lines changed

‎.devcontainer/Dockerfile_aarch64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# must use ubuntu:22.04 for qt 5.15
21
FROM --platform=linux/aarch64 ubuntu:22.04
32

43
ENV DEBIAN_FRONTEND=noninteractive
@@ -11,7 +10,7 @@ ARG PYTHON_VERSION=3.11
1110

1211
ENV LD_LIBRARY_PATH=/workspaces/pymeshlab/pymeshlab/lib/
1312

14-
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
13+
RUN apt-get -y update && apt-get -y install \
1514
build-essential \
1615
fontconfig \
1716
fuse \
@@ -39,12 +38,13 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
3938
# install python
4039
RUN apt-get -y install software-properties-common && \
4140
add-apt-repository ppa:deadsnakes/ppa -y && apt-get -y update && \
42-
apt-get -y install python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-distutils && \
41+
apt-get -y install python${PYTHON_VERSION} python${PYTHON_VERSION}-dev && \
4342
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1 && \
4443
wget https://bootstrap.pypa.io/get-pip.py && \
4544
python${PYTHON_VERSION} get-pip.py && \
4645
rm get-pip.py && \
47-
pip install numpy
46+
pip install numpy && \
47+
pip install setuptools
4848

4949
# install latest cmake and embree
5050
RUN apt-get -y purge --auto-remove cmake && \

‎.devcontainer/Dockerfile_x86_64‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
FROM --platform=linux/amd64 ubuntu:20.04
1+
FROM --platform=linux/amd64 ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
24

35
ARG USERNAME=pymeshlab
46
ARG USER_UID=1000
57
ARG USER_GID=$USER_UID
68

7-
ARG QT_VERSION=5.15.2
89
ARG PYTHON_VERSION=3.11
910

10-
ENV PATH=/opt/qt/${QT_VERSION}/gcc_64/bin:$PATH
11-
ENV LD_LIBRARY_PATH=/opt/qt/${QT_VERSION}/gcc_64/lib/:/workspaces/pymeshlab/pymeshlab/lib/
12-
ENV QT_PLUGIN_PATH=/opt/qt/${QT_VERSION}/gcc_64/plugins/
13-
ENV QML_IMPORT_PATH=/opt/qt/${QT_VERSION}/gcc_64/qml/
14-
ENV QML2_IMPORT_PATH=/opt/qt/${QT_VERSION}/gcc_64/qml/
11+
ENV LD_LIBRARY_PATH=/workspaces/pymeshlab/pymeshlab/lib/
1512

16-
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
13+
RUN apt-get -y update && apt-get -y install \
1714
build-essential \
1815
fontconfig \
1916
fuse \
@@ -25,41 +22,30 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
2522
libegl-dev \
2623
libfuse2 \
2724
libgmp-dev \
25+
libgomp1 \
2826
libglu1-mesa-dev \
2927
libmpfr-dev \
3028
libpulse-mainloop-glib0 \
3129
libtbb-dev \
32-
libxcb-icccm4-dev \
33-
libxcb-image0-dev \
34-
libxcb-keysyms1-dev \
35-
libxcb-render-util0-dev \
36-
libxcb-shape0 \
37-
libxcb-xinerama0-dev \
38-
libxcb-xkb-dev \
39-
libxkbcommon-x11-dev \
4030
libxerces-c-dev \
4131
patchelf \
32+
qtbase5-dev \
33+
qt5-qmake \
4234
rsync \
4335
# to be removed
44-
python3 \
45-
python3-pip \
4636
unzip \
47-
wget && \
48-
pip3 install aqtinstall
49-
50-
RUN aqt install-qt -O /opt/qt linux desktop ${QT_VERSION} && \
51-
pip3 uninstall -y aqtinstall && \
52-
apt-get -y remove python3-pip python3
37+
wget
5338

5439
# install python
5540
RUN apt-get -y install software-properties-common && \
5641
add-apt-repository ppa:deadsnakes/ppa -y && apt-get -y update && \
57-
apt-get -y install python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-distutils && \
42+
apt-get -y install python${PYTHON_VERSION} python${PYTHON_VERSION}-dev && \
5843
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1 && \
5944
wget https://bootstrap.pypa.io/get-pip.py && \
6045
python${PYTHON_VERSION} get-pip.py && \
6146
rm get-pip.py && \
62-
pip install numpy
47+
pip install numpy && \
48+
pip install setuptools
6349

6450
# install latest cmake and embree
6551
RUN apt-get -y purge --auto-remove cmake && \

‎.github/workflows/BuildAndTest.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
17-
os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
17+
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
1818
exclude:
1919
- os: macos-latest
2020
pyversion: '3.9'
@@ -45,7 +45,7 @@ jobs:
4545
p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
4646
p12-password: ${{ secrets.MACOS_CERTIFICATE_PSSW }}
4747
- name: Install Qt
48-
if: matrix.os != 'macos-latest'
48+
if: ${{ matrix.os != 'macos-latest' && matrix.os != 'ubuntu-22.04-arm' }}
4949
uses: jurplel/install-qt-action@v3
5050
with:
5151
cache: true
@@ -62,6 +62,10 @@ jobs:
6262
if: matrix.os == 'macos-latest'
6363
run: |
6464
brew install qt@5
65+
- name: Install apt qt
66+
if: matrix.os == 'ubuntu-22.04-arm'
67+
run: |
68+
sudo apt-get install qtbase5-dev qt5-qmake
6569
- name: Cache external libraries sources
6670
id: cache-ext-libs
6771
uses: actions/cache@v4
@@ -92,7 +96,7 @@ jobs:
9296
fail-fast: false
9397
matrix:
9498
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
95-
os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
99+
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
96100
exclude:
97101
- os: macos-latest
98102
pyversion: '3.9'
@@ -134,7 +138,7 @@ jobs:
134138
fail-fast: false
135139
matrix:
136140
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
137-
os: ['ubuntu-latest', 'macos-13', 'macos-latest', 'windows-latest']
141+
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
138142
exclude:
139143
- os: macos-latest
140144
pyversion: '3.9'
@@ -157,6 +161,10 @@ jobs:
157161
- name: Install dependencies
158162
run: |
159163
pip install pytest numpy
164+
- name: Install linux dependencies
165+
if: runner.os == 'Linux'
166+
run: |
167+
sudo apt-get install libopengl0
160168
- name: Set CPU opengl
161169
if: runner.os == 'Windows'
162170
run: |
@@ -178,7 +186,7 @@ jobs:
178186
fail-fast: false
179187
matrix:
180188
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
181-
os: ['ubuntu-latest', 'macos-13', 'macos-latest', 'windows-latest']
189+
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
182190
exclude:
183191
- os: macos-latest
184192
pyversion: '3.9'
@@ -203,6 +211,10 @@ jobs:
203211
run: |
204212
pip install pytest numpy
205213
pip install pymeshlab*.whl
214+
- name: Install linux dependencies
215+
if: runner.os == 'Linux'
216+
run: |
217+
sudo apt-get install libopengl0
206218
- name: Set CPU opengl
207219
if: runner.os == 'Windows'
208220
run: |

‎.github/workflows/BuildDocumentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
jobs:
1010
build_pymeshlab:
1111
name: Build PyMeshLab
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
strategy:
1414
matrix:
1515
pyversion: [3.8]

‎.github/workflows/CreateAndTestRelease.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
matrix:
3535
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
36-
os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
36+
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
3737
exclude:
3838
- os: macos-latest
3939
pyversion: '3.9'
@@ -65,11 +65,15 @@ jobs:
6565
p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
6666
p12-password: ${{ secrets.MACOS_CERTIFICATE_PSSW }}
6767
- name: Install Qt
68-
if: matrix.os != 'macos-latest'
68+
if: ${{ matrix.os != 'macos-latest' && matrix.os != 'ubuntu-22.04-arm' }}
6969
uses: jurplel/install-qt-action@v3
7070
with:
7171
cache: true
7272
version: ${{ env.QT_VERSION }}
73+
- name: Install apt qt
74+
if: matrix.os == 'ubuntu-22.04-arm'
75+
run: |
76+
sudo apt-get install qtbase5-dev qt5-qmake
7377
- name: Install Python ${{ matrix.pyversion }}
7478
uses: actions/setup-python@v5
7579
with:
@@ -111,7 +115,7 @@ jobs:
111115
strategy:
112116
matrix:
113117
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
114-
os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
118+
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
115119
exclude:
116120
- os: macos-latest
117121
pyversion: '3.9'
@@ -152,7 +156,7 @@ jobs:
152156
strategy:
153157
matrix:
154158
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
155-
os: ['ubuntu-latest', 'macos-13', 'macos-latest', 'windows-latest']
159+
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
156160
exclude:
157161
- os: macos-latest
158162
pyversion: '3.9'
@@ -175,6 +179,10 @@ jobs:
175179
- name: Install dependencies
176180
run: |
177181
pip install pytest numpy
182+
- name: Install linux dependencies
183+
if: runner.os == 'Linux'
184+
run: |
185+
sudo apt-get install libopengl0
178186
- name: Set CPU opengl
179187
if: runner.os == 'Windows'
180188
run: |
@@ -195,7 +203,7 @@ jobs:
195203
strategy:
196204
matrix:
197205
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
198-
os: ['ubuntu-latest', 'macos-13', 'macos-latest', 'windows-latest']
206+
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
199207
exclude:
200208
- os: macos-latest
201209
pyversion: '3.9'
@@ -220,6 +228,10 @@ jobs:
220228
run: |
221229
pip install pytest numpy
222230
pip install pymeshlab*.whl
231+
- name: Install linux dependencies
232+
if: runner.os == 'Linux'
233+
run: |
234+
sudo apt-get install libopengl0
223235
- name: Set CPU opengl
224236
if: runner.os == 'Windows'
225237
run: |

‎scripts/Linux/0_setup_env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev
3+
sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libfuse2
44
sudo apt-get install -y make ninja-build patchelf libgmp-dev libmpfr-dev libxerces-c-dev
55
sudo apt-get install -y libtbb-dev
66

0 commit comments

Comments
 (0)