bootstrap: Remove pyhton2 packages

We dropped support for python2 in Samba already.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

28 files changed, 1 insertions, 177 deletions

diff --git a/bootstrap/config.py b/bootstrap/config.py
index f4acdf5d925..d91506124f1 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -127,16 +127,6 @@ PKGS = [
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
 
-    # python
-    ('python-dev', 'python-devel'),
-    ('python-dbg', ''),
-    ('python-iso8601', ''),
-    ('python-gpg', 'python2-gpg'),  # defaults to ubuntu/fedora latest
-    ('python-crypto', 'python-crypto'),
-    ('python-markdown', 'python-markdown'),
-    ('python-dnspython', 'python-dns'),
-    ('python-pexpect', ''),  # for wintest only
-
     ('python3', 'python3'),
     ('python3-dev', 'python3-devel'),
     ('python3-dbg', ''),
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 441eba7918e..1082825e190 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -83,11 +83,6 @@ yum install -y \
     popt-devel \
     procps \
     psmisc \
-    pygpgme \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
     python3-crypto \
     python3-dns \
     python3-markdown \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 168fbe9d334..76ad25de37c 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -69,11 +69,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - pygpgme
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
   - python3-crypto
   - python3-dns
   - python3-markdown
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c74cdd470d0..629a88018bb 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -83,11 +83,6 @@ yum install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    pygpgme \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
     python36 \
     python36-crypto \
     python36-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 9623698b9ff..57464db7bb0 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -69,11 +69,6 @@ packages:
   - popt-devel
   - procps-ng
   - psmisc
-  - pygpgme
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
   - python36
   - python36-crypto
   - python36-devel
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index 4e126cf5e8e..afbed5cf699 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -77,14 +77,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 667825c283e..958130da942 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -66,14 +66,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 4c8c65223f9..c28b8c75af1 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -80,14 +80,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index a2d4bdb0638..ac02aaa98fe 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -69,14 +69,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index fa7051a67e1..06943efaae0 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -80,14 +80,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpg \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 1e3bd0c380c..81b76bbf6f3 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -69,14 +69,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpg
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 048efa5f3a3..a46bb5f6fcf 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -84,11 +84,6 @@ dnf install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
-    python2-gpg \
     python3 \
     python3-crypto \
     python3-devel \
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index c96df0b96a1..023889bcb4c 100644
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -73,11 +73,6 @@ packages:
   - popt-devel
   - procps-ng
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
-  - python2-gpg
   - python3
   - python3-crypto
   - python3-devel
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 048efa5f3a3..a46bb5f6fcf 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -84,11 +84,6 @@ dnf install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
-    python2-gpg \
     python3 \
     python3-crypto \
     python3-devel \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index c96df0b96a1..023889bcb4c 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -73,11 +73,6 @@ packages:
   - popt-devel
   - procps-ng
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
-  - python2-gpg
   - python3
   - python3-crypto
   - python3-devel
diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index 048efa5f3a3..a46bb5f6fcf 100755
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -84,11 +84,6 @@ dnf install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
-    python2-gpg \
     python3 \
     python3-crypto \
     python3-devel \
diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index c96df0b96a1..023889bcb4c 100644
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -73,11 +73,6 @@ packages:
   - popt-devel
   - procps-ng
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
-  - python2-gpg
   - python3
   - python3-crypto
   - python3-devel
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 4bf205e5ffb..940bd3dc177 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -78,11 +78,6 @@ zypper --non-interactive install \
     popt-devel \
     procps \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-markdown \
-    python2-dnspython \
-    python2-gpg \
     python2-semanage \
     python3 \
     python3-Markdown \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 8183e89804e..f108d386a0a 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -66,11 +66,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-markdown
-  - python2-dnspython
-  - python2-gpg
   - python2-semanage
   - python3
   - python3-Markdown
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 4bf205e5ffb..940bd3dc177 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -78,11 +78,6 @@ zypper --non-interactive install \
     popt-devel \
     procps \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-markdown \
-    python2-dnspython \
-    python2-gpg \
     python2-semanage \
     python3 \
     python3-Markdown \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 8183e89804e..f108d386a0a 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -66,11 +66,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-markdown
-  - python2-dnspython
-  - python2-gpg
   - python2-semanage
   - python3
   - python3-Markdown
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 65625604f4b..78a1379d140 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -78,14 +78,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 8838828d7b8..5a67ba7b8ec 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -67,14 +67,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index a47ef984cb5..6226b51a6db 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -79,14 +79,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 23939c38e80..b9b145488aa 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -68,14 +68,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 45212ccfb81..f5a1edddf31 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -81,14 +81,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpg \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index f2c981fba83..0e37e70bc97 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -70,14 +70,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpg
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index f4d7219402e..09b0d25ece3 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-e4c3da88c459ae1a97c1c5e41f52b17d688d295f
+8cfc53988524dd9a32ed64bfdfcd623631cc8398