From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 5 May 2022 03:44:05 +0000 (+1200)
Subject: bootstrap: matplotlib is not a real Samba dep
X-Git-Tag: talloc-2.3.4~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7244a64478a6425ee720c752b6cf73a576bbb6c8;p=thirdparty%2Fsamba.git

bootstrap: matplotlib is not a real Samba dep

This came in via the original list of packages used
at Catalyst when building Samba for testing, in particular
related to an example LDB module to trace LDB requests.

There is no testing need for this even in make test.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index bd73e82b906..ee32c57a3a6 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 24f32ce7e4d6be357394ec3cf7b9e15b48a20cf1
+  SAMBA_CI_CONTAINER_TAG: 2bfb75bf56b5b40fd57f22b7cfcfdd69d65e4f78
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 8bf3cadcc4b..dc1ff100cfd 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -140,7 +140,6 @@ PKGS = [
     ('python3-iso8601', 'python3-iso8601'),
     ('python3-gpg', 'python3-gpg'),  # defaults to ubuntu/fedora latest
     ('python3-markdown', 'python3-markdown'),
-    ('python3-matplotlib', ''),
     ('python3-dnspython', 'python3-dns'),
     ('python3-pexpect', ''),  # for wintest only
     ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 07d6209c072..f90cac1c817 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -91,7 +91,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-matplotlib \
     python3-pexpect \
     python3-pyasn1 \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 6d3c2385339..c98575758ed 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -80,7 +80,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-matplotlib
   - python3-pexpect
   - python3-pyasn1
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index f35c8fa90ea..da5e2d7e335 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -91,7 +91,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-matplotlib \
     python3-pexpect \
     python3-pyasn1 \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index bff014dbb7e..a497af15d59 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -80,7 +80,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-matplotlib
   - python3-pexpect
   - python3-pyasn1
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index f35c8fa90ea..da5e2d7e335 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -91,7 +91,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-matplotlib \
     python3-pexpect \
     python3-pyasn1 \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index bff014dbb7e..a497af15d59 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -80,7 +80,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-matplotlib
   - python3-pexpect
   - python3-pyasn1
   - python3-setproctitle
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b2f8ce45aee..b8f70028a27 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-24f32ce7e4d6be357394ec3cf7b9e15b48a20cf1
+2bfb75bf56b5b40fd57f22b7cfcfdd69d65e4f78