mirror of
https://github.com/samba-team/samba.git
synced 2025-03-25 14:50:24 +03:00
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>
This commit is contained in:
Andreas Schneider
Andreas Schneider
parent
7bceafe840
commit
42edab7bd7
@ -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.
|
||||
|
||||
@ -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', ''),
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -69,11 +69,6 @@ packages:
|
||||
- popt-devel
|
||||
- procps
|
||||
- psmisc
|
||||
- pygpgme
|
||||
- python-crypto
|
||||
- python-devel
|
||||
- python-dns
|
||||
- python-markdown
|
||||
- python3-crypto
|
||||
- python3-dns
|
||||
- python3-markdown
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -69,11 +69,6 @@ packages:
|
||||
- popt-devel
|
||||
- procps-ng
|
||||
- psmisc
|
||||
- pygpgme
|
||||
- python-crypto
|
||||
- python-devel
|
||||
- python-dns
|
||||
- python-markdown
|
||||
- python36
|
||||
- python36-crypto
|
||||
- python36-devel
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -66,11 +66,6 @@ packages:
|
||||
- popt-devel
|
||||
- procps
|
||||
- psmisc
|
||||
- python-crypto
|
||||
- python-devel
|
||||
- python-markdown
|
||||
- python2-dnspython
|
||||
- python2-gpg
|
||||
- python2-semanage
|
||||
- python3
|
||||
- python3-Markdown
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -66,11 +66,6 @@ packages:
|
||||
- popt-devel
|
||||
- procps
|
||||
- psmisc
|
||||
- python-crypto
|
||||
- python-devel
|
||||
- python-markdown
|
||||
- python2-dnspython
|
||||
- python2-gpg
|
||||
- python2-semanage
|
||||
- python3
|
||||
- python3-Markdown
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1 +1 @@
|
||||
e4c3da88c459ae1a97c1c5e41f52b17d688d295f
|
||||
8cfc53988524dd9a32ed64bfdfcd623631cc8398
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user