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>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 734d5152c00004ddba2372d101637e859af23873..77b7406f4a6c23f213ee0fac1400cc2288bcc02e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: e4c3da88c459ae1a97c1c5e41f52b17d688d295f
+  SAMBA_CI_CONTAINER_TAG: 8cfc53988524dd9a32ed64bfdfcd623631cc8398
   #
   # 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 f4acdf5d92550496cfda3199230eb12b53f2956d..d91506124f1c48c303050b6fa31e7acc3035a9b1 100644 (file)
--- 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 441eba7918e4c8d523401f1fa8880d248e3bf1c7..1082825e19023fcfeb7adbdd4111ddfa157c6a46 100755 (executable)
--- 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 168fbe9d334c5cae52889c810d9f9e907903c216..76ad25de37cd96b5e5cbd667cc2344073a18845f 100644 (file)
--- 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 c74cdd470d094eaea11cfa0d261973517253ca6d..629a88018bbf601b1e692c8565683288c2ff25c5 100755 (executable)
--- 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 9623698b9ffe61dac6cd42bf14aa63031cbc9bd7..57464db7bb09dd11db60417127def7cac73ff137 100644 (file)
--- 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 4e126cf5e8ed761682e7e39b0b1214a9e0c61a0d..afbed5cf699284aa35c402ae62a090973f7f04bc 100755 (executable)
--- 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 667825c283e1cf60a43f03d2ccb57790a3b24209..958130da942fb1fd571ad6a43ccdaacdfe51e309 100644 (file)
--- 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 4c8c65223f979f3bcbc978b6b5e09120a6302e66..c28b8c75af13e8146cd54adbf3f70dbeba69a650 100755 (executable)
--- 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 a2d4bdb0638acf6c03369b35acccd9115222b58d..ac02aaa98fe704cd7dc109b4157ac579d880dad0 100644 (file)
--- 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 fa7051a67e189a39a20b9b5fb4fad2c2fc0c97f3..06943efaae00d0922b127860a1cb97c2f8d77134 100755 (executable)
--- 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 1e3bd0c380c64f1e9db800df17864e3f6b1185ff..81b76bbf6f3605426fc2322100028fc902438aea 100644 (file)
--- 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 048efa5f3a336e663e8e9727084c6439e04dd583..a46bb5f6fcfb373e7d0db1b61eee562b9c42dbe9 100755 (executable)
--- 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 c96df0b96a136eecfd74a4ecea7ea59ba2f0ea07..023889bcb4c00dccc67a11a97821d43e3edf9dda 100644 (file)
--- 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 048efa5f3a336e663e8e9727084c6439e04dd583..a46bb5f6fcfb373e7d0db1b61eee562b9c42dbe9 100755 (executable)
--- 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 c96df0b96a136eecfd74a4ecea7ea59ba2f0ea07..023889bcb4c00dccc67a11a97821d43e3edf9dda 100644 (file)
--- 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 048efa5f3a336e663e8e9727084c6439e04dd583..a46bb5f6fcfb373e7d0db1b61eee562b9c42dbe9 100755 (executable)
--- 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 c96df0b96a136eecfd74a4ecea7ea59ba2f0ea07..023889bcb4c00dccc67a11a97821d43e3edf9dda 100644 (file)
--- 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 4bf205e5ffb42535d3d608bf6752acf2a96542ae..940bd3dc1770b5fb6a61f6b753324791119ce544 100755 (executable)
--- 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 8183e89804ef357bdb3a4e542ea525df2dff2775..f108d386a0a261754ebd0ae8f209c49dc2e88686 100644 (file)
--- 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 4bf205e5ffb42535d3d608bf6752acf2a96542ae..940bd3dc1770b5fb6a61f6b753324791119ce544 100755 (executable)
--- 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 8183e89804ef357bdb3a4e542ea525df2dff2775..f108d386a0a261754ebd0ae8f209c49dc2e88686 100644 (file)
--- 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 65625604f4bb592973e7f0e9744bbde8e08d8b1e..78a1379d14014c15c9f5e9b4a72fda401a524b01 100755 (executable)
--- 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 8838828d7b8b19fce6f19f7f25e357b09f84f948..5a67ba7b8ecafa19089c8bdbc71c7fcd8664b532 100644 (file)
--- 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 a47ef984cb542fd8075311b1c24168a15fc540d3..6226b51a6dbd9dd8f99371daa45bd78da08774ee 100755 (executable)
--- 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 23939c38e80fd73bb48013b1b970744f0b01c350..b9b145488aacf576732e629f88f5d59e6f7a99c8 100644 (file)
--- 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 45212ccfb8143442329e6fe3dbbafd328e6d8ccc..f5a1edddf31e677c2ed0521f421e46f15094d201 100755 (executable)
--- 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 f2c981fba83d92a6aec31966ce97016d100d6abc..0e37e70bc97975b0e280dffee59ae2b79bf09691 100644 (file)
--- 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 f4d7219402e639d5bb83b4f9594c3062e7681d97..09b0d25ece3a982ba0c7378263f68c358f89f761 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-e4c3da88c459ae1a97c1c5e41f52b17d688d295f
+8cfc53988524dd9a32ed64bfdfcd623631cc8398