facts: add missing Alpine mapping for python-boto3 package

This is available since 3.14 at least.

Further, alpine edge now refuses to install any packages using
'pip' unless a virtualenv is utilized, so the pip fallback is
unusable.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

7 files changed, 7 insertions, 16 deletions

diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 81b21ce..cac7854 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -1680,7 +1680,7 @@ mappings:
 
   python3-boto3:
     default: python3-boto3
-    apk:
+    apk: py3-boto3
     pkg: py39-boto3
 
   python3-devel:
diff --git a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
index 5aae3de..f4d80c2 100644
--- a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
@@ -160,6 +160,7 @@ RUN apk update && \
         pkgconf \
         polkit \
         pulseaudio-dev \
+        py3-boto3 \
         py3-dbus \
         py3-docutils \
         py3-flake8 \
@@ -174,7 +175,6 @@ RUN apk update && \
         py3-setuptools \
         py3-sphinx \
         py3-sphinx_rtd_theme \
-        py3-wheel \
         py3-yaml \
         python3 \
         python3-dev \
@@ -232,8 +232,6 @@ RUN apk update && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN /usr/bin/pip3 install boto3
-
 RUN cpanm --notest \
           Archive::Tar \
           CPAN::Changes \
diff --git a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
index cc6ca9c..65b9762 100644
--- a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
@@ -160,6 +160,7 @@ RUN apk update && \
         pkgconf \
         polkit \
         pulseaudio-dev \
+        py3-boto3 \
         py3-dbus \
         py3-docutils \
         py3-flake8 \
@@ -174,7 +175,6 @@ RUN apk update && \
         py3-setuptools \
         py3-sphinx \
         py3-sphinx_rtd_theme \
-        py3-wheel \
         py3-yaml \
         python3 \
         python3-dev \
@@ -234,8 +234,6 @@ RUN apk update && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN /usr/bin/pip3 install boto3
-
 RUN cpanm --notest \
           Archive::Tar \
           CPAN::Changes \
diff --git a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
index f5acf2d..d08f1d9 100644
--- a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
@@ -160,6 +160,7 @@ RUN apk update && \
         pkgconf \
         polkit \
         pulseaudio-dev \
+        py3-boto3 \
         py3-dbus \
         py3-docutils \
         py3-flake8 \
@@ -174,7 +175,6 @@ RUN apk update && \
         py3-setuptools \
         py3-sphinx \
         py3-sphinx_rtd_theme \
-        py3-wheel \
         py3-yaml \
         python3 \
         python3-dev \
@@ -234,8 +234,6 @@ RUN apk update && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN /usr/bin/pip3 install boto3
-
 RUN cpanm --notest \
           Archive::Tar \
           CPAN::Changes \
diff --git a/tests/data/packages/out/alpine-315.yml b/tests/data/packages/out/alpine-315.yml
index 2113fd0..04d0f84 100644
--- a/tests/data/packages/out/alpine-315.yml
+++ b/tests/data/packages/out/alpine-315.yml
@@ -180,6 +180,7 @@ native:
 - pkgconf
 - polkit
 - pulseaudio-dev
+- py3-boto3
 - py3-dbus
 - py3-docutils
 - py3-flake8
@@ -249,5 +250,3 @@ native:
 - zlib-static
 - zstd
 - zstd-dev
-pypi:
-- boto3
diff --git a/tests/data/packages/out/alpine-316.yml b/tests/data/packages/out/alpine-316.yml
index e42e022..7078ca8 100644
--- a/tests/data/packages/out/alpine-316.yml
+++ b/tests/data/packages/out/alpine-316.yml
@@ -180,6 +180,7 @@ native:
 - pkgconf
 - polkit
 - pulseaudio-dev
+- py3-boto3
 - py3-dbus
 - py3-docutils
 - py3-flake8
@@ -251,5 +252,3 @@ native:
 - zlib-static
 - zstd
 - zstd-dev
-pypi:
-- boto3
diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml
index e42e022..7078ca8 100644
--- a/tests/data/packages/out/alpine-edge.yml
+++ b/tests/data/packages/out/alpine-edge.yml
@@ -180,6 +180,7 @@ native:
 - pkgconf
 - polkit
 - pulseaudio-dev
+- py3-boto3
 - py3-dbus
 - py3-docutils
 - py3-flake8
@@ -251,5 +252,3 @@ native:
 - zlib-static
 - zstd
 - zstd-dev
-pypi:
-- boto3