Skip to content

Commit 1cfd04c

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "gnocchi-base: numpy provides aarch64 binary wheels"
2 parents 34253ad + 9bad71d commit 1cfd04c

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

docker/gnocchi/gnocchi-base/Dockerfile.j2

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
5151
'librados2-devel',
5252
] %}
5353

54-
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
55-
# it needs to be built
56-
57-
{% if base_arch != 'x86_64' %}
58-
{% set gnocchi_base_packages = gnocchi_base_packages + [
59-
'blas-devel',
60-
'lapack-devel'
61-
] %}
62-
{% endif %}
63-
6454
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
6555
RUN mkdir -p /var/www/cgi-bin/gnocchi
6656
{% elif base_package_type == 'deb' %}
@@ -69,16 +59,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi
6959
'librados-dev',
7060
] %}
7161

72-
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
73-
# it needs to be built
74-
75-
{% if base_arch != 'x86_64' %}
76-
{% set gnocchi_base_packages = gnocchi_base_packages + [
77-
'libblas-dev',
78-
'liblapack-dev'
79-
] %}
80-
{% endif %}
81-
8262
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
8363

8464
{% endif %}

0 commit comments

Comments
 (0)