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 bd73e82b9066271c31cd8174ca0ab3b706da2604..ee32c57a3a60b172e98ea5e9504e12acc4718525 100644 (file)
--- 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 8bf3cadcc4b8fbc052c10fd87f7f077edd8da51d..dc1ff100cfdc2b3db04a21e751c3e1bc28775495 100644 (file)
--- 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 07d6209c072b162c64470f2ecf67dedc13483810..f90cac1c8172b70078ffaa4ca821658b1289aa6d 100755 (executable)
--- 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 6d3c2385339027c77187d00fb64345877931737f..c98575758ed35378e68e66ca5648a7fcee055f07 100644 (file)
--- 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 f35c8fa90ea1aef1aaa3424d1165a309932e2403..da5e2d7e33509fe0c6ed21ddfe221951c4a79dfd 100755 (executable)
--- 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 bff014dbb7e34354464eb4b6a7e4a1ecebc1fc77..a497af15d59ff8ee9a9ac5644a7cbfe83196ae12 100644 (file)
--- 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 f35c8fa90ea1aef1aaa3424d1165a309932e2403..da5e2d7e33509fe0c6ed21ddfe221951c4a79dfd 100755 (executable)
--- 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 bff014dbb7e34354464eb4b6a7e4a1ecebc1fc77..a497af15d59ff8ee9a9ac5644a7cbfe83196ae12 100644 (file)
--- 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 b2f8ce45aee05d4472d2a31f7cbb665e80c9ec96..b8f70028a2713b10165262f96a682e3a576dcc86 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-24f32ce7e4d6be357394ec3cf7b9e15b48a20cf1
+2bfb75bf56b5b40fd57f22b7cfcfdd69d65e4f78