[COMMIT osv master] scripts: remove old Ubuntu and Fedora from setup.py; added support of Fedora 29

5 views
Skip to first unread message

Commit Bot

unread,
Jul 30, 2019, 12:00:31 PM7/30/19
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

scripts: remove old Ubuntu and Fedora from setup.py; added support of
Fedora 29

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/scripts/setup.py b/scripts/setup.py
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -61,48 +61,6 @@ class Fedora(object):
test_packages = ['openssl-devel']
ec2_post_install = standard_ec2_post_install

- class Fedora_19(object):
- packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '19'
-
- class Fedora_20(object):
- packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '20'
-
- class Fedora_21(object):
- packages =
['java-1.7.0-openjdk', 'python-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '21'
-
- class Fedora_22(object):
- packages =
['java-1.8.0-openjdk', 'python-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '22'
-
- class Fedora_23(object):
- packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '23'
-
- class Fedora_24(object):
- packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
- ec2_packages = []
- test_packages = []
- ec2_post_install = None
- version = '24'
-
class Fedora_25(object):
packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
@@ -111,27 +69,34 @@ class Fedora_25(object):
version = '25'

class Fedora_26(object):
- packages =
['java-1.8.0-openjdk', 'python2-requests', 'compat-openssl10-devel']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '26'

class Fedora_27(object):
- packages =
['java-1.8.0-openjdk', 'python2-requests', 'compat-openssl10-devel']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '27'

class Fedora_28(object):
- packages =
['java-1.8.0-openjdk', 'python2-requests', 'compat-openssl10-devel']
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
+ ec2_packages = []
+ test_packages = []
+ ec2_post_install = None
+ version = '28'
+
+ class Fedora_29(object):
+ packages =
['java-1.8.0-openjdk', 'python2-requests', 'openssl-devel']
ec2_packages = []
test_packages = []
ec2_post_install = None
version = '28'

- versions = [Fedora_19, Fedora_20, Fedora_21, Fedora_22, Fedora_23,
Fedora_24, Fedora_25, Fedora_26, Fedora_27, Fedora_28]
+ versions = [Fedora_25, Fedora_26, Fedora_27, Fedora_28, Fedora_29]

class RHELbased(Fedora):
name = ['Scientific Linux', 'NauLinux', 'CentOS Linux', 'Red Hat
Enterprise Linux', 'Oracle Linux']
@@ -296,28 +261,7 @@ class Ubuntu_16_04(object):
ec2_post_install = None
version = '16.04'

- class Ubuntu_15_04(object):
- packages = ['openjdk-7-jdk', 'libvirt-bin']
- ec2_packages = ['ec2-api-tools', 'awscli']
- test_packages = []
- ec2_post_install = None
- version = '15.04'
-
- class Ubuntu_14_04(object):
- packages = ['openjdk-7-jdk', 'libvirt-bin']
- ec2_packages = ['ec2-api-tools', 'awscli']
- test_packages = []
- ec2_post_install = None
- version = '14.04'
-
- class Ubuntu_13_10(object):
- packages = ['openjdk-7-jdk', 'libvirt-bin']
- ec2_packages = []
- test_packages = []
- ec2_post_install = standard_ec2_post_install
- version = '13.10'
-
- versions = [Ubuntu_19_04, Ubuntu_18_10, Ubuntu_18_04, Ubuntu_17_04,
Ubuntu_16_04, Ubuntu_15_04, Ubuntu_14_04, Ubuntu_13_10]
+ versions = [Ubuntu_19_04, Ubuntu_18_10, Ubuntu_18_04, Ubuntu_17_04,
Ubuntu_16_04]

class LinuxMint(Ubuntu):
name = 'LinuxMint'
Reply all
Reply to author
Forward
0 new messages