mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
bootstrap: Fix python dependencies
Python2 dependencies are removed and the RPM name of python-iso8601 is added to allow removal from third_party. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: David Mulder <dmulder@suse.com>
This commit is contained in:
Andrew Bartlett
parent
7dc535995b
commit
0573c13da2
@ -23,7 +23,7 @@ variables:
|
||||
# Set this to the contents of bootstrap/sha1sum.txt
|
||||
# which is generated by bootstrap/template.py --render
|
||||
#
|
||||
SAMBA_CI_CONTAINER_TAG: 1275dc52ac8c1de5981f267df88b85b6f87e299a
|
||||
SAMBA_CI_CONTAINER_TAG: abd0e3b4cadc9691200c43769e69a3a7b50d9fde
|
||||
#
|
||||
# We use the ubuntu1804 image as default as
|
||||
# it matches what we have on sn-devel-184.
|
||||
|
||||
@ -134,7 +134,7 @@ PKGS = [
|
||||
('python3-cryptography', 'python3-cryptography'), # for krb5 tests
|
||||
('python3-dev', 'python3-devel'),
|
||||
('python3-dbg', ''),
|
||||
('python3-iso8601', ''),
|
||||
('python3-iso8601', 'python3-iso8601'),
|
||||
('python3-gpg', 'python3-gpg'), # defaults to ubuntu/fedora latest
|
||||
('python3-markdown', 'python3-markdown'),
|
||||
('python3-matplotlib', ''),
|
||||
@ -393,7 +393,6 @@ DEB_DISTS = {
|
||||
'docker_image': 'ubuntu:16.04',
|
||||
'vagrant_box': 'ubuntu/xenial64',
|
||||
'replace': {
|
||||
'python-gpg': 'python-gpgme',
|
||||
'python3-gpg': 'python3-gpgme',
|
||||
'glusterfs-common': '',
|
||||
'libcephfs-dev': '',
|
||||
@ -508,7 +507,6 @@ RPM_DISTS = {
|
||||
'perl-generators': '',
|
||||
'perl-interpreter': '',
|
||||
'procps-ng': 'procps',
|
||||
'python-dns': 'python2-dnspython',
|
||||
'python3-dns': 'python3-dnspython',
|
||||
'python3-markdown': 'python3-Markdown',
|
||||
'quota-devel': '',
|
||||
@ -540,7 +538,6 @@ RPM_DISTS = {
|
||||
'perl-generators': '',
|
||||
'perl-interpreter': '',
|
||||
'procps-ng': 'procps',
|
||||
'python-dns': 'python2-dnspython',
|
||||
'python3-dns': 'python3-dnspython',
|
||||
'python3-markdown': 'python3-Markdown',
|
||||
'quota-devel': '',
|
||||
|
||||
@ -87,6 +87,7 @@ yum install -y \
|
||||
python36-cryptography \
|
||||
python36-devel \
|
||||
python36-dns \
|
||||
python36-iso8601 \
|
||||
python36-markdown \
|
||||
python36-pyasn1 \
|
||||
quota-devel \
|
||||
|
||||
@ -73,6 +73,7 @@ packages:
|
||||
- python36-cryptography
|
||||
- python36-devel
|
||||
- python36-dns
|
||||
- python36-iso8601
|
||||
- python36-markdown
|
||||
- python36-pyasn1
|
||||
- quota-devel
|
||||
|
||||
@ -92,6 +92,7 @@ yum install -y \
|
||||
python3-devel \
|
||||
python3-dns \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-libsemanage \
|
||||
python3-markdown \
|
||||
python3-policycoreutils \
|
||||
|
||||
@ -74,6 +74,7 @@ packages:
|
||||
- python3-devel
|
||||
- python3-dns
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-libsemanage
|
||||
- python3-markdown
|
||||
- python3-policycoreutils
|
||||
|
||||
@ -88,6 +88,7 @@ dnf install -y \
|
||||
python3-devel \
|
||||
python3-dns \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-libsemanage \
|
||||
python3-markdown \
|
||||
python3-policycoreutils \
|
||||
|
||||
@ -77,6 +77,7 @@ packages:
|
||||
- python3-devel
|
||||
- python3-dns
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-libsemanage
|
||||
- python3-markdown
|
||||
- python3-policycoreutils
|
||||
|
||||
@ -88,6 +88,7 @@ dnf install -y \
|
||||
python3-devel \
|
||||
python3-dns \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-libsemanage \
|
||||
python3-markdown \
|
||||
python3-policycoreutils \
|
||||
|
||||
@ -77,6 +77,7 @@ packages:
|
||||
- python3-devel
|
||||
- python3-dns
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-libsemanage
|
||||
- python3-markdown
|
||||
- python3-policycoreutils
|
||||
|
||||
@ -85,6 +85,7 @@ zypper --non-interactive install \
|
||||
python3-devel \
|
||||
python3-dnspython \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-pyasn1 \
|
||||
readline-devel \
|
||||
rng-tools \
|
||||
|
||||
@ -73,6 +73,7 @@ packages:
|
||||
- python3-devel
|
||||
- python3-dnspython
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-pyasn1
|
||||
- readline-devel
|
||||
- rng-tools
|
||||
|
||||
@ -85,6 +85,7 @@ zypper --non-interactive install \
|
||||
python3-devel \
|
||||
python3-dnspython \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-pyasn1 \
|
||||
readline-devel \
|
||||
rng-tools \
|
||||
|
||||
@ -73,6 +73,7 @@ packages:
|
||||
- python3-devel
|
||||
- python3-dnspython
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-pyasn1
|
||||
- readline-devel
|
||||
- rng-tools
|
||||
|
||||
@ -1 +1 @@
|
||||
1275dc52ac8c1de5981f267df88b85b6f87e299a
|
||||
abd0e3b4cadc9691200c43769e69a3a7b50d9fde
|
||||
|
||||
Loading…
Reference in New Issue
Block a user