Fix deprecated commands with data (vponcova, gh#232)

Remove call to xgettext_werror.sh during build

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -184,109 +184,3 @@ pykickstart-1.78.tar.gz
 /pykickstart-3.10.tar.gz
 /pykickstart-3.11.tar.gz
 /pykickstart-3.12.tar.gz
-/pykickstart-3.13.tar.gz
-/pykickstart-3.14.tar.gz
-/pykickstart-3.15.tar.gz
-/pykickstart-3.16.tar.gz
-/pykickstart-3.17.tar.gz
-/pykickstart-3.18.tar.gz
-/pykickstart-3.19.tar.gz
-/pykickstart-3.19.tar.gz.asc
-/pykickstart-3.20.tar.gz
-/pykickstart-3.20.tar.gz.asc
-/pykickstart-3.21.tar.gz
-/pykickstart-3.21.tar.gz.asc
-/pykickstart-3.22.tar.gz
-/pykickstart-3.22.tar.gz.asc
-/pykickstart-3.23.tar.gz
-/pykickstart-3.23.tar.gz.asc
-/pykickstart-3.24.tar.gz
-/pykickstart-3.24.tar.gz.asc
-/pykickstart-3.25.tar.gz
-/pykickstart-3.25.tar.gz.asc
-/pykickstart-3.26.tar.gz
-/pykickstart-3.26.tar.gz.asc
-/pykickstart-3.27.tar.gz
-/pykickstart-3.27.tar.gz.asc
-/pykickstart-3.28.tar.gz
-/pykickstart-3.28.tar.gz.asc
-/pykickstart-3.29.tar.gz
-/pykickstart-3.29.tar.gz.asc
-/pykickstart-3.30.tar.gz
-/pykickstart-3.30.tar.gz.asc
-/pykickstart-3.31.tar.gz
-/pykickstart-3.31.tar.gz.asc
-/pykickstart-3.32.tar.gz
-/pykickstart-3.32.tar.gz.asc
-/pykickstart-3.33.tar.gz
-/pykickstart-3.33.tar.gz.asc
-/pykickstart-3.34.tar.gz
-/pykickstart-3.34.tar.gz.asc
-/pykickstart-3.35.tar.gz
-/pykickstart-3.35.tar.gz.asc
-/pykickstart-3.36.tar.gz
-/pykickstart-3.36.tar.gz.asc
-/pykickstart-3.37.tar.gz
-/pykickstart-3.37.tar.gz.asc
-/pykickstart-3.38.tar.gz
-/pykickstart-3.38.tar.gz.asc
-/pykickstart-3.39.tar.gz
-/pykickstart-3.39.tar.gz.asc
-/pykickstart-3.40.tar.gz
-/pykickstart-3.40.tar.gz.asc
-/pykickstart-3.41.tar.gz
-/pykickstart-3.41.tar.gz.asc
-/pykickstart-3.42.tar.gz
-/pykickstart-3.42.tar.gz.asc
-/pykickstart-3.43.tar.gz
-/pykickstart-3.43.tar.gz.asc
-/pykickstart-3.44.tar.gz
-/pykickstart-3.44.tar.gz.asc
-/pykickstart-3.45.tar.gz
-/pykickstart-3.45.tar.gz.asc
-/pykickstart-3.46.tar.gz
-/pykickstart-3.46.tar.gz.asc
-/pykickstart-3.47.tar.gz
-/pykickstart-3.47.tar.gz.asc
-/pykickstart-3.48.tar.gz
-/pykickstart-3.48.tar.gz.asc
-/pykickstart-3.49.tar.gz
-/pykickstart-3.49.tar.gz.asc
-/pykickstart-3.50.tar.gz
-/pykickstart-3.50.tar.gz.asc
-/pykickstart-3.51.tar.gz
-/pykickstart-3.51.tar.gz.asc
-/pykickstart-3.52.tar.gz
-/pykickstart-3.52.tar.gz.asc
-/pykickstart-3.53.tar.gz
-/pykickstart-3.53.tar.gz.asc
-/pykickstart-3.54.tar.gz
-/pykickstart-3.54.tar.gz.asc
-/pykickstart-3.55.tar.gz
-/pykickstart-3.55.tar.gz.asc
-/pykickstart-3.56.tar.gz
-/pykickstart-3.56.tar.gz.asc
-/pykickstart-3.57.tar.gz
-/pykickstart-3.57.tar.gz.asc
-/pykickstart-3.58.tar.gz
-/pykickstart-3.58.tar.gz.asc
-/pykickstart-3.59.tar.gz
-/pykickstart-3.59.tar.gz.asc
-/pykickstart-3.60.tar.gz
-/pykickstart-3.60.tar.gz.asc
-/pykickstart-3.61.tar.gz
-/pykickstart-3.61.tar.gz.asc
-/pykickstart-3.62.tar.gz
-/pykickstart-3.62.tar.gz.asc
-/pykickstart-3.63.tar.gz
-/pykickstart-3.63.tar.gz.asc
-/pykickstart-3.64.tar.gz
-/pykickstart-3.64.tar.gz.asc
-/pykickstart-3.65.tar.gz
-/pykickstart-3.65.tar.gz.asc
-/pykickstart-3.66.tar.gz
-/pykickstart-3.66.tar.gz.asc
-/pykickstart-3.67.tar.gz
-/pykickstart-3.67.tar.gz.asc
-/pykickstart-3.68.tar.gz
-/pykickstart-3.68.tar.gz.asc

0001-Add-support-for-fcoe-autovlan.patch

@@ -0,0 +1,113 @@
+From 2e3c65c0631033d9952925e59b13897f5b1cc186 Mon Sep 17 00:00:00 2001
+From: Radek Vykydal <rvykydal@redhat.com>
+Date: Tue, 10 Apr 2018 11:22:12 +0200
+Subject: [PATCH 1/2] Add support for fcoe --autovlan
+
+Related: rhbz#1564096
+
+This option is actually not required since RHEL7 where autovlan is used by
+default.  We just need to parse kickstarts used for RHEL7 and RHEL6 (where the
+option may have some effect).
+---
+ pykickstart/commands/fcoe.py | 32 +++++++++++++++++++++++++++++---
+ pykickstart/handlers/f28.py  |  4 ++--
+ tests/commands/fcoe.py       |  7 +++++++
+ 3 files changed, 38 insertions(+), 5 deletions(-)
+
+diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py
+index f2b4d17..beca517 100644
+--- a/pykickstart/commands/fcoe.py
++++ b/pykickstart/commands/fcoe.py
+@@ -17,7 +17,7 @@
+ # subject to the GNU General Public License and may only be used or replicated
+ # with the express permission of Red Hat, Inc.
+ #
+-from pykickstart.version import F12, F13, RHEL7
++from pykickstart.version import F12, F13, F28, RHEL7
+ from pykickstart.base import BaseData, KickstartCommand
+ from pykickstart.options import KSOptionParser
+ 
+@@ -86,7 +86,23 @@ class RHEL7_FcoeData(F13_FcoeData):
+ 
+         return retval
+ 
+-class RHEL8_FcoeData(F13_FcoeData):
++class F28_FcoeData(F13_FcoeData):
++    removedKeywords = F13_FcoeData.removedKeywords
++    removedAttrs = F13_FcoeData.removedAttrs
++
++    def __init__(self, *args, **kwargs):
++        F13_FcoeData.__init__(self, *args, **kwargs)
++        self.autovlan = kwargs.get("autovlan", False)
++
++    def _getArgsAsStr(self):
++        retval = F13_FcoeData._getArgsAsStr(self)
++
++        if self.autovlan:
++            retval += " --autovlan"
++
++        return retval
++
++class RHEL8_FcoeData(F28_FcoeData):
+     pass
+ 
+ class F12_Fcoe(KickstartCommand):
+@@ -150,5 +166,15 @@ class RHEL7_Fcoe(F13_Fcoe):
+                         help="", version=RHEL7)
+         return op
+ 
+-class RHEL8_Fcoe(F13_Fcoe):
++class F28_Fcoe(F13_Fcoe):
++    removedKeywords = F13_Fcoe.removedKeywords
++    removedAttrs = F13_Fcoe.removedAttrs
++
++    def _getParser(self):
++        op = F13_Fcoe._getParser(self)
++        op.add_argument("--autovlan", action="store_true", default=False,
++                        help="", version=F28)
++        return op
++
++class RHEL8_Fcoe(F28_Fcoe):
+     pass
+diff --git a/pykickstart/handlers/f28.py b/pykickstart/handlers/f28.py
+index 9921d1e..70c66d6 100644
+--- a/pykickstart/handlers/f28.py
++++ b/pykickstart/handlers/f28.py
+@@ -42,7 +42,7 @@ class F28Handler(BaseHandler):
+         "dmraid": commands.dmraid.F24_DmRaid,
+         "driverdisk": commands.driverdisk.F14_DriverDisk,
+         "eula": commands.eula.F20_Eula,
+-        "fcoe": commands.fcoe.F13_Fcoe,
++        "fcoe": commands.fcoe.F28_Fcoe,
+         "firewall": commands.firewall.F28_Firewall,
+         "firstboot": commands.firstboot.FC3_Firstboot,
+         "graphical": commands.displaymode.F26_DisplayMode,
+@@ -102,7 +102,7 @@ class F28Handler(BaseHandler):
+         "DriverDiskData": commands.driverdisk.F14_DriverDiskData,
+         "DeviceData": commands.device.F8_DeviceData,
+         "DmRaidData": commands.dmraid.FC6_DmRaidData,
+-        "FcoeData": commands.fcoe.F13_FcoeData,
++        "FcoeData": commands.fcoe.F28_FcoeData,
+         "GroupData": commands.group.F12_GroupData,
+         "IscsiData": commands.iscsi.F17_IscsiData,
+         "LogVolData": commands.logvol.F23_LogVolData,
+diff --git a/tests/commands/fcoe.py b/tests/commands/fcoe.py
+index 6f268fa..ebd346e 100644
+--- a/tests/commands/fcoe.py
++++ b/tests/commands/fcoe.py
+@@ -95,5 +95,12 @@ class RHEL7_TestCase(F13_TestCase):
+         self.assert_parse("fcoe --nic=eth0 --autovlan",
+                           "fcoe --nic=eth0 --autovlan\n")
+ 
++class F28_TestCase(F13_TestCase):
++    def runTest(self):
++        F13_TestCase.runTest(self)
++
++        self.assert_parse("fcoe --nic=eth0 --autovlan",
++                          "fcoe --nic=eth0 --autovlan\n")
++
+ if __name__ == "__main__":
+     unittest.main()
+-- 
+2.14.3
+

0002-Update-fcoe-command-help.patch

@@ -0,0 +1,74 @@
+From fd46d8289eba963a18f198f67a06a869426cf178 Mon Sep 17 00:00:00 2001
+From: Radek Vykydal <rvykydal@redhat.com>
+Date: Tue, 10 Apr 2018 11:54:08 +0200
+Subject: [PATCH 2/2] Update fcoe command help
+
+Related: rhbz#1564096
+---
+ pykickstart/commands/fcoe.py | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py
+index beca517..78e86a2 100644
+--- a/pykickstart/commands/fcoe.py
++++ b/pykickstart/commands/fcoe.py
+@@ -122,8 +122,12 @@ class F12_Fcoe(KickstartCommand):
+         return retval
+ 
+     def _getParser(self):
+-        op = KSOptionParser(prog="fcoe", description="", version=F12)
+-        op.add_argument("--nic", required=True, version=F12, help="")
++        op = KSOptionParser(prog="fcoe", description="""
++                            Discover and attach FCoE storage devices accessible via
++                            specified network interface
++                            """, version=F12)
++        op.add_argument("--nic", required=True, version=F12, help="""
++                        Name of the network device connected to the FCoE switch""")
+         return op
+ 
+     def parse(self, args):
+@@ -152,8 +156,13 @@ class F13_Fcoe(F12_Fcoe):
+ 
+     def _getParser(self):
+         op = F12_Fcoe._getParser(self)
+-        op.add_argument("--dcb", action="store_true", default=False, help="",
+-                        version=F13)
++        op.add_argument("--dcb", action="store_true", default=False, version=F13, help="""
++                        Enable Data Center Bridging awareness in installer. This option
++                        should only be enabled for network interfaces that
++                        require a host-based DCBX client. Configurations on
++                        interfaces that implement a hardware DCBX client should
++                        not use it.
++                        """)
+         return op
+ 
+ class RHEL7_Fcoe(F13_Fcoe):
+@@ -162,8 +171,10 @@ class RHEL7_Fcoe(F13_Fcoe):
+ 
+     def _getParser(self):
+         op = F13_Fcoe._getParser(self)
+-        op.add_argument("--autovlan", action="store_true", default=False,
+-                        help="", version=RHEL7)
++        op.add_argument("--autovlan", action="store_true", default=False, version=RHEL7, help="""
++                        Perform automatic VLAN discovery and setup. This option is enabled
++                        by default.
++                        """)
+         return op
+ 
+ class F28_Fcoe(F13_Fcoe):
+@@ -172,8 +183,10 @@ class F28_Fcoe(F13_Fcoe):
+ 
+     def _getParser(self):
+         op = F13_Fcoe._getParser(self)
+-        op.add_argument("--autovlan", action="store_true", default=False,
+-                        help="", version=F28)
++        op.add_argument("--autovlan", action="store_true", default=False, version=F28, help="""
++                        Perform automatic VLAN discovery and setup. This option is enabled
++                        by default.
++                        """)
+         return op
+ 
+ class RHEL8_Fcoe(F28_Fcoe):
+-- 
+2.14.3
+

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

plans/run-tests.fmf

@@ -1,8 +0,0 @@
-summary: Run pykickstart tests
-prepare:
-    how: install
-    package:
-    - python3-kickstart
-    - pykickstart
-execute:
-    script: ./tests/scripts/run_tests.sh

pykickstart-deprecated-commands-data.patch

@@ -0,0 +1,67 @@
+commit 086e82ce2516e2c18ec6be237cb6df67cb6c3b4d
+Author: Vendula Poncova <vponcova@redhat.com>
+Date:   Thu Apr 19 14:59:17 2018 +0200
+
+    Fix deprecated commands with data
+    
+    It wasn't possible to parse deprecated commands with data,
+    for example device, dmraid and multipath in Fedora 28.
+    
+    Added a test that will try to parse all deprecated commands.
+
+diff --git a/pykickstart/base.py b/pykickstart/base.py
+index a49adf5..00b5c8f 100644
+--- a/pykickstart/base.py
++++ b/pykickstart/base.py
+@@ -196,6 +196,15 @@ class DeprecatedCommand(KickstartCommand):
+         # Create a new DeprecatedCommand instance.
+         KickstartCommand.__init__(self, writePriority, *args, **kwargs)
+ 
++    def dataList(self):
++        """Override the method of the deprecated command."""
++        return None
++
++    @property
++    def dataClass(self):
++        """Override the attribute of the deprecated command."""
++        return None
++
+     def __str__(self):
+         """Placeholder since DeprecatedCommands don't work anymore."""
+         return ""
+diff --git a/tests/misc.py b/tests/misc.py
+index 1e14638..63a70da 100644
+--- a/tests/misc.py
++++ b/tests/misc.py
+@@ -1,4 +1,8 @@
+ import unittest
++import warnings
++
++from pykickstart.parser import KickstartParser
++from pykickstart.version import makeVersion
+ from tests.baseclass import ParserTest
+ from pykickstart.handlers import control
+ from pykickstart.base import DeprecatedCommand
+@@ -53,5 +57,22 @@ class WritePriority_TestCase(unittest.TestCase):
+                 else:
+                     self.assertEqual(0, cmd.writePriority, command_class)
+ 
++class DeprecatedCommandsParsing_TestCase(unittest.TestCase):
++    def runTest(self):
++        for version, command_map in control.commandMap.items():
++
++            handler = makeVersion(version)
++            parser = KickstartParser(handler)
++
++            for command_name, command_class in command_map.items():
++                if not issubclass(command_class, DeprecatedCommand):
++                    continue
++
++                with warnings.catch_warnings(record=True):
++                    # The deprecated commands should be ignored with
++                    # a warning when they are parsed. Make sure that
++                    # they will not cause any errors.
++                    parser.readKickstartFromString(command_name)
++
+ if __name__ == "__main__":
+     unittest.main()

pykickstart-rhbz1578930.patch

@@ -0,0 +1,56 @@
+commit f618b966fe3358b89412e58b9b249edb35b154dc
+Author: Vendula Poncova <vponcova@redhat.com>
+Date:   Thu May 17 20:38:22 2018 +0200
+
+    Include the _sortCommand to the _setCommand method (#1578930)
+    
+    The _sortCommand method should be part of the _setCommand method,
+    otherwise we might set the command without changing the _writeOrder
+    dictionary.
+    
+    This should fix the resetCommand method, where the dictionary wasn't
+    updated, so the old instance of the command was used to generate the
+    kickstart representation.
+    
+    Resolves: rhbz#1578930
+
+diff --git a/pykickstart/base.py b/pykickstart/base.py
+index 00b5c8f..f695dcc 100644
+--- a/pykickstart/base.py
++++ b/pykickstart/base.py
+@@ -306,7 +306,6 @@ class KickstartHandler(KickstartObject):
+ 
+         setattr(self, name.lower(), cmdObj)
+ 
+-    def _sortCommand(self, cmdObj):
+         # Also, add the object into the _writeOrder dict in the right place.
+         if cmdObj.writePriority is not None:
+             if cmdObj.writePriority in self._writeOrder:
+@@ -332,7 +331,6 @@ class KickstartHandler(KickstartObject):
+         if cmdObj is None:
+             cmdObj = cmdClass()
+             self._setCommand(cmdObj)
+-            self._sortCommand(cmdObj)
+ 
+         # Finally, add the mapping to the commands dict.
+         self.commands[cmdName] = cmdObj
+diff --git a/tests/base.py b/tests/base.py
+index 2d3961c..e1f4689 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -232,6 +232,7 @@ class HandlerResetCommand_TestCase(ParserTest):
+         self.assertTrue(self.handler.autopart.encrypted)
+         self.assertEqual(self.handler.autopart.passphrase, "something")
+         self.assertTrue(self.handler.autopart.bogus)
++        self.assertTrue("autopart" in str(self.handler))
+ 
+         self.handler.resetCommand("autopart")
+         self.assertFalse(self.handler.autopart.autopart)
+@@ -239,6 +240,7 @@ class HandlerResetCommand_TestCase(ParserTest):
+         self.assertFalse(self.handler.autopart.encrypted)
+         self.assertEqual(self.handler.autopart.passphrase, "")
+         self.assertNotIn("bogus", self.handler.autopart.__dict__)
++        self.assertFalse("autopart" in str(self.handler))
+ 
+ class HandlerDispatch_TestCase(ParserTest):
+     def runTest(self):

pykickstart-translation-canary.patch

@@ -0,0 +1,13 @@
+diff -up pykickstart-3.12/po/Makefile.orig pykickstart-3.12/po/Makefile
+--- pykickstart-3.12/po/Makefile.orig	2018-02-19 11:41:09.000000000 -0500
++++ pykickstart-3.12/po/Makefile	2018-05-22 16:15:46.650917679 -0400
+@@ -12,8 +12,7 @@ INSTALL_NLS_DIR = $(DESTDIR)/`$(PYTHON)
+ 
+ # PO catalog handling
+ MSGMERGE	= msgmerge -v
+-XGETTEXT	= ../translation-canary/xgettext_werror.sh --default-domain=$(NLSPACKAGE) \
+-		  --add-comments
++XGETTEXT	= xgettext --default-domain=$(NLSPACKAGE) --add-comments
+ MSGFMT		= msgfmt --statistics --verbose
+ 
+ # What do we need to do

pykickstart.spec

@@ -1,42 +1,80 @@
-# Enable tests by default. To disable them use:
-#     rpmbuild -ba --without runtests pykickstart.spec
-%bcond_without runtests
-%bcond_with signed
+%if 0%{?rhel} > 7
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
+# Disable tests by default because they fail to run inside mock builds
+# at the moment, but can run locally.  To build and run tests, do:
+#     rpmbuild -ba --with runtests pykickstart.spec
+%bcond_with runtests
 
 Name:      pykickstart
-Version:   3.68
-Release:   1%{?dist}
-License:   GPL-2.0-only
+Version:   3.12
+Release:   5%{?dist}
+License:   GPLv2 and MIT
+Group:     System Environment/Libraries
 Summary:   Python utilities for manipulating kickstart files.
 Url:       http://fedoraproject.org/wiki/pykickstart
-Source0:   https://github.com/pykickstart/%{name}/releases/download/r%{version}/%{name}-%{version}.tar.gz
-%if %{with signed}
-Source1:   https://github.com/pykickstart/%{name}/releases/download/r%{version}/%{name}-%{version}.tar.gz.asc
-%endif
+# This is a Red Hat maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
+Source0:   %{name}-%{version}.tar.gz
+Patch0:    0001-Add-support-for-fcoe-autovlan.patch
+Patch1:    0002-Update-fcoe-command-help.patch
+Patch2:    pykickstart-rhbz1578930.patch
+Patch3:    pykickstart-translation-canary.patch
+Patch4:    pykickstart-deprecated-commands-data.patch
 
 BuildArch: noarch
 
 BuildRequires: gettext
+%if %{with python2}
+BuildRequires: python2-coverage
+BuildRequires: python2-devel
+BuildRequires: python2-nose
+BuildRequires: python-ordered-set
+BuildRequires: python2-setuptools
+BuildRequires: python2-requests
+%endif
+
+BuildRequires: python3-coverage
 BuildRequires: python3-devel
-BuildRequires: python3-pip
+BuildRequires: python3-nose
+BuildRequires: python3-ordered-set
 BuildRequires: python3-requests
 BuildRequires: python3-setuptools
-BuildRequires: make
-BuildRequires: python3-pytest
-
-# Only required when building with runtests
-%if %{with runtests}
+BuildRequires: python3-six
 BuildRequires: python3-sphinx
-%endif
 
 Requires: python3-kickstart = %{version}-%{release}
 
 %description
-Python utilities for manipulating kickstart files.
+Python utilities for manipulating kickstart files.  The Python 2 and 3 libraries
+can be found in the packages python-kickstart and python3-kickstart
+respectively.
 
+%if %{with python2}
+# Python 2 library
+%package -n python2-kickstart
+%{?python_provide:%python_provide python2-kickstart}
+%{?python_provide:%python_provide python2-pykickstart}
+Summary:  Python 2 library for manipulating kickstart files.
+Requires: python2-six
+Requires: python2-requests
+Requires: python2-ordered-set
+
+%description -n python2-kickstart
+Python 2 library for manipulating kickstart files.  The binaries are found in
+the pykickstart package.
+%endif
+
+# Python 3 library
 %package -n python3-kickstart
 Summary:  Python 3 library for manipulating kickstart files.
+Requires: python3-six
 Requires: python3-requests
+Requires: python3-ordered-set
 
 %description -n python3-kickstart
 Python 3 library for manipulating kickstart files.  The binaries are found in
@@ -45,18 +83,49 @@ the pykickstart package.
 %prep
 %setup -q
 
+# For https://bugzilla.redhat.com/show_bug.cgi?id=1564096
+%patch0 -p1
+%patch1 -p1
+
+# For https://bugzilla.redhat.com/show_bug.cgi?id=1578930
+%patch2 -p1
+
+%patch3 -p1
+%patch4 -p1
+
+%if %{with python2}
+rm -rf %{py3dir}
+mkdir %{py3dir}
+cp -a . %{py3dir}
+%endif
+
 %build
+%if %{with python2}
+make PYTHON=%{__python2}
+make -C %{py3dir} PYTHON=%{__python3}
+%else
 make PYTHON=%{__python3}
+%endif
 
 %install
+%if %{with python2}
+make PYTHON=%{__python2} DESTDIR=%{buildroot} install
+make -C %{py3dir} PYTHON=%{__python3} DESTDIR=%{buildroot} install
+%else
 make PYTHON=%{__python3} DESTDIR=%{buildroot} install
+%endif
 
 %check
 %if %{with runtests}
-LC_ALL=C make PYTHON=%{__python3} test-no-coverage
+%if %{with python2}
+make -C %{py3dir} PYTHON=%{__python3} test
+%else
+make PYTHON=%{__python3} test
+%endif
 %endif
 
 %files
+%defattr(-,root,root,-)
 %license COPYING
 %doc README.rst
 %doc data/kickstart.vim
@@ -69,686 +138,38 @@ LC_ALL=C make PYTHON=%{__python3} test-no-coverage
 %{_mandir}/man1/ksvalidator.1.gz
 %{_mandir}/man1/ksverdiff.1.gz
 
+%if %{with python2}
+%files -n python2-kickstart
+%defattr(-,root,root,-)
+%doc docs/2to3
+%doc docs/programmers-guide
+%doc docs/kickstart-docs.txt
+%{python2_sitelib}/pykickstart*.egg-info
+%{python2_sitelib}/pykickstart
+%endif
+
 %files -n python3-kickstart
+%defattr(-,root,root,-)
 %doc docs/2to3
 %doc docs/programmers-guide
 %doc docs/kickstart-docs.txt
 %{python3_sitelib}/pykickstart
-%{python3_sitelib}/pykickstart-%{version}.dist-info
+%{python3_sitelib}/pykickstart*.egg-info
 
 %changelog
-* Tue Dec 02 2025 Brian C. Lane <bcl@redhat.com> - 3.68-1
-- rhsm: Add Flatpak registry option for RHEL10 (bciconel)
-- commands: bootc: remove 'experimental' warning (k.koukiou)
+* Mon Jul 16 2018 Chris Lumens <clumens@redhat.com> - 3.12-5
+- Fix deprecated commands with data (vponcova, gh#232)
 
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.67-2
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Mon Aug 18 2025 Brian C. Lane <bcl@redhat.com> - 3.67-1
-- spec: Add python3-pytest to BuildRequires (bcl)
-- tests: Use pytest module instead of unittest (bcl)
-- workflows: Use py3.14 rc.1 (bcl)
-- Add Fedora 44 support (bcl)
-- spec: drop python3-build dependency (yselkowi)
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.66-4
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.66-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jul 22 2025 Brian C. Lane <bcl@redhat.com> - 3.66-2
-- Drop python3-build, it is not needed to install the package
-
-* Tue Jul 15 2025 Brian C. Lane <bcl@redhat.com> - 3.66-1
-- workflows: Use py3.14 beta.4 (bcl)
-- pylint: Ignore files in .git (bcl)
-- pyproject: Bump setuptools to 77 or later (bcl)
-- Makefile: Stop running setup.py directly (bcl)
-
-* Mon Jun 16 2025 Brian C. Lane <bcl@redhat.com> - 3.65-1
-- workflows: Add python 3.14 to the test matrix (bcl)
-- Add support for RDP (jkonecny)
-- Deprecate VNC (jkonecny)
-- docs: Fix chapter numbering after adding certificate (bcl)
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 3.64-2
-- Rebuilt for Python 3.14
-
-* Fri Apr 25 2025 Brian C. Lane <bcl@redhat.com> - 3.64-1
-- workflow: Add python 3.13 testing (bcl)
-- tests: Remove unused import of constants (bcl)
-- realm: Clean up documentation (bcl)
-- Add support for new bootc kickstart command (ppolawsk)
-- Update documentation for clearpart --initlabel option. (rvykydal)
-- Update the %certificate section documentation (rvykydal)
-
-* Mon Feb 24 2025 Brian C. Lane <bcl@redhat.com> - 3.63-1
-- Do not remove "md" prefix from RAID names (vtrefny)
-- Add Fedora 43 support (bcl)
-- workflows: Switch to ubuntu-latest (bcl)
-- Update formatting of certificate section documentation (rvykydal)
-- Update %certificate documentation with not about bundles (rvykydal)
-- Fix formatting of %certificate documentation example (rvykydal)
-- Update %certificate section documentation (rvykydal)
-
-* Wed Jan 29 2025 Brian C. Lane <bcl@redhat.com> - 3.62-1
-- Make %%certificate section option --dir mandatory. (rvykydal)
-  Resolves: rhbz#2342762
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.61-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan 09 2025 Brian C. Lane <bcl@redhat.com> - 3.61-1
-- runpylint: Log astroid version (bcl)
-- tests: Limit the python versions used in testing (bcl)
-- Add support for inline certificates with `%certificate` section (k.koukiou)
-
-* Thu Oct 03 2024 Brian C. Lane <bcl@redhat.com> - 3.60-1
-- module: Remove unused warnings import (bcl)
-- tox: Add py313 to tox and 3.12.7 to workflow (bcl)
-- Fix the fix for _parse_optional changing (awilliam)
-
-* Wed Oct 02 2024 Brian C. Lane <bcl@redhat.com> - 3.59-1
-- options: adjust to behavior change in upstream _parse_optional (awilliam)
-- Add Fedora 42 support (jkonecny)
-
-* Mon Aug 19 2024 Brian C. Lane <bcl@redhat.com> - 3.58-1
-- DeprecatedCommand: Return empty list for dataList (bcl)
-
-* Mon Aug 19 2024 Brian C. Lane <bcl@redhat.com> - 3.57-1
-- Add "hw-passphrase" option for autopart and part commands (vtrefny)
-- Enhance %onerror section with recommendation (jkonecny)
-  Resolves: RHEL-47142
-- commands: Add missing DeprecatedCommand class to F41_Module (kkoukiou)
-
-* Mon Aug 05 2024 Brian C. Lane <bcl@redhat.com> - 3.56-1
-- doc/versionremoved: Update VersionChange import for Sphinx 8.0.0 (bcl)
-- Mark the vnc command as deprecated on RHEL 10 (mkolman)
-  Resolves: RHEL-41219
-- pykickstart is supported on python 3.6+ (sgallagh)
-- timezone: Remove the --isUtc, --nontp, and --ntpserver arguments (bcl)
-  Related: RHEL-34009
-- packages: Remove the old camel case arguments on RHEL10 (bcl)
-  Resolves: RHEL-34009
-- nvdimm: Remove support for the nvdimm command on RHEL10 (bcl)
-  Related: RHEL-34009
-- Drop the MIT license (bcl)
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.55-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.55-2
-- Rebuilt for Python 3.13
-
-* Mon May 13 2024 Brian C. Lane <bcl@redhat.com> - 3.55-1
-- Deprecate modularity on Fedora 41 (marusak.matej)
-- btrfs: Remove support for the btrfs command on RHEL10 (bcl)
-  Resolves: RHEL-34009
-- Deprecate modularity on RHEL 10 (marusak.matej)
-  Resolves: RHEL-34829
-
-* Thu Apr 25 2024 Brian C. Lane <bcl@redhat.com> - 3.54-1
-- Add a DEFAULT_VERSION variable to version.py (bcl)
-- Deprecate network team options on RHEL 10 (rvykydal)
-
-* Wed Apr 03 2024 Brian C. Lane <bcl@redhat.com> - 3.53-1
-- Update sources to github release urls
-- rhel10: autopart on RHEL does not support --type=btrfs (bcl)
-- rhel10: Add test for btrfs command deprecation (bcl)
-- rhel10: Add missing rhsm and syspurpose commands (bcl)
-- Break out %pre example to kickstart-examples (tasleson)
-- Update kickstart-docs.rst (tasleson)
-- Add Fedora 41 support (bcl)
-- Update RHEL 9 handler (bcl)
-- Update RHEL 10 handler classes (bcl)
-- Add RHEL 10 handler (bcl)
-- workflow: Use python 3.12.2 for tests (bcl)
-- workflow: Bump checkout and setup-python actions to new versions (bcl)
-
-* Thu Feb 01 2024 Brian C. Lane <bcl@redhat.com> - 3.52-1
-- Deprecate %%packages --instLangs and --excludeWeakdeps kickstart options (vponcova)
-- Deprecate timezone --isUtc, --ntpservers and --nontp kickstart options (vponcova)
-- Fix the assert_removed check in the unit tests (vponcova)
-- Remove the repo --ignoregroups kickstart option in Fedora 40 (vponcova)
-- Remove the logging --level kickstart option in Fedora 40 (vponcova)
-- Remove the method kickstart command in Fedora 40 (vponcova)
-- Remove the autostep kickstart command in Fedora 40 (vponcova)
-- requirements: Add setuptools (bcl)
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.51-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.51-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Nov 28 2023 Brian C. Lane <bcl@redhat.com> - 3.51-1
-- Deprecate the nvdimm kickstart command (vponcova)
-
-* Fri Nov 10 2023 Brian C. Lane <bcl@redhat.com> - 3.50-1
-- Add Fedora 40 support (bcl)
-- remove control characters from license (cmdr)
-- scripts: Fix wording in documentation (bcl)
-- workflow: Fix test for python 3.12.0 version (bcl)
-
-* Wed Oct 25 2023 Brian C. Lane <bcl@redhat.com> - 3.49-1
-- tox: Only run unit tests for python 3.6 (bcl)
-- workflow: Update to py3.12.0 (bcl)
-- pykickstart: Set timeout to 120s on requests.get (bcl)
-- translation-canary: Update the subtree with current master (bcl)
-- Squashed 'translation-canary/' changes from 840c2d64..5bb81253 (bcl)
-- tests: Add python 3.12 support (bcl)
-- tests: Update unicode test to remove deprecated resetlocale (bcl)
-- rtd: formats is separate, not part of sphinx (bcl)
-- rtd: Add the .readthedocs.yaml config file (bcl)
-- spec: Update spec with changes from Fedora (bcl)
-- Makefile: Update pypi upload command (bcl)
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.48-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 3.48-2
-- Rebuilt for Python 3.12
-
-* Thu Jun 08 2023 Brian C. Lane <bcl@redhat.com> - 3.48-1
-- Makefile: Add a test-no-coverage target (bcl)
-- realm: switch from pipes.quote() to shlex.quote() (ptoscano)
-- workflow: Update actions to newest versions (bcl)
-- Fix issues how to generate encrypted passwords (woiling)
-
-* Fri Mar 17 2023 Brian C. Lane <bcl@redhat.com> - 3.47-1
-- network: Move new options to Fedora 39 (bcl)
-  Related: rhbz#1656662
-- displaymode: Update description to describe behavior (bcl)
-
-* Tue Mar 14 2023 Brian C. Lane <bcl@redhat.com> - 3.46-1
-- Add conflict test between ostree sources (#2125655) (jkonecny)
-  Related: rhbz#2125655
-- Fix missing seen check for output generation (#2125655) (jkonecny)
-  Related: rhbz#2125655
-- Add new ostreecontainer command (#2125655) (jkonecny)
-  Related: rhbz#2125655
-  Resolves: rhbz#2125655
-  Related: rhbz#2125655
-- Check the conflicting commands automatically (vponcova)
-- Fix tests for conflicting commands (vponcova)
-- Add conflicting commands support (bcl)
-- Fix handling of package section arguments in older versions (bcl)
-
-* Tue Mar 14 2023 Brian C. Lane <bcl@redhat.com> - 3.45-1
-- workflow: Update to use released python 3.11 version (bcl)
-- Don't allow to use --sdboot and --extlinux together (vponcova)
-- tests: add bootloader sdboot option (jeremy.linton)
-- bootloader: Add systemd-boot support with --sdboot (jeremy.linton)
-- Add %%changelog section to pykickstart.spec.in (jkonecny)
-- Do not request sign for rc-release Makefile target (jkonecny)
-- Do not require SPECFILE for rc-release (jkonecny)
-- Add missing docs copy to scratch Makefile (jkonecny)
-- Add support for Fedora 39 (vslavik)
-
-* Wed Feb 15 2023 Brian C. Lane <bcl@redhat.com> - 3.44-1
-- Add DNS handling options to the network command (vslavik)
-  Related: rhbz#1656662
-- Fix the coverage report (vponcova)
-- whitelist_externals has changed to allowlist_externals (bcl)
-- Update %post example for DNS problems (bcl)
-- deps: Move dependencies into requirements.txt (bcl)
-- Fix syntax of a code sample (ewoud)
-
-* Mon Jan 30 2023 Brian C. Lane <bcl@redhat.com> - 3.43-3
-- SPDX migration
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.43-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Aug 29 2022 Brian C. Lane <bcl@redhat.com> - 3.43-1
-- pyproject.toml: Add dependencies (bcl)
-- sshkey: Escapes quotes in the ssh key (bcl)
-  Resolves: rhbz#2117734
-- test: Add Python 3.11 to test matrix (bcl)
-- Add --hibernation option to AutoPart (ozobal)
-- Makefile: Include pyproject.toml in new release commit (bcl)
-
-* Tue Aug 16 2022 Brian C. Lane <bcl@redhat.com> - 3.42-1
-- Use RHEL9 for RHEL command documentation (bcl)
-- setup.py: use setuptools not distutils (bcl)
-- Add pyproject.toml and update setup.py (bcl)
-- Add Fedora 38 support (bcl)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.41-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 3.41-2
-- Rebuilt for Python 3.11
-
-* Thu Jun 16 2022 Brian C. Lane <bcl@redhat.com> - 3.41-1
-- Write commands in alphabetical order (bcl)
-  Resolves: rhbz#2096871
-
-* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.40-2
-- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Brian C. Lane <bcl@redhat.com> - 3.40-1
-- Add support for automatic LUN Scan (vponcova)
-  Related: rhbz#1432883
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.39-2
-- Rebuilt for Python 3.11
-
-* Thu Jun 02 2022 Brian C. Lane <bcl@redhat.com> - 3.39-1
-- tests: Fix unused out variable warnings (bcl)
-- rootpw: Add an --allow-ssh argument (bcl)
-  Resolves: rhbz#2083269
-- github: Fix workflow to only send coverage for python 3.9 (bcl)
-
-* Thu Apr 07 2022 Brian C. Lane <bcl@redhat.com> - 3.38-1
-- Add test for missing closing quote (bcl)
-- i18n: Pass gettext domain on every translation call (bcl)
-
-* Mon Feb 28 2022 Brian C. Lane <bcl@redhat.com> - 3.37-1
-- Remove the --ignorebroken option from RHEL handlers (vponcova)
-- Add the isRHEL function (vponcova)
-
-* Tue Feb 15 2022 Brian C. Lane <bcl@redhat.com> - 3.36-1
-- github: Add rhel9-branch to the list of branches (bcl)
-- github: Use python 3.10 instead of a rc release (bcl)
-- Fix validation of packages arguments (bcl)
-- Add Fedora 37 support (vslavik)
-- Add Fedora 36 support (vslavik)
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.35-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Oct 12 2021 Brian C. Lane <bcl@redhat.com> - 3.35-1
-- bootloader: Fix --md5pass documentation (bcl)
-- Update ksvalidator manpage for multiple input files (vslavik)
-- Test new code paths in ksvalidator (vslavik)
-- ksvalidator: Add file globbing (vslavik)
-- Rename _is_url() to is_url() to make it public (vslavik)
-- ksvalidator: Add support for multiple files (vslavik)
-- ksvalidator: Handle empty files (bcl)
-- ksflatten: Add test coverage for unknown version (bcl)
-- tests: Add python 3.10 to the test matrix (bcl)
-- ksflatten: Fix pylint complaint about msg reuse (bcl)
-- Remove more python2 compatability (bcl)
-- tests: Ignore new pylint warnings (bcl)
-- Fix typo "installaton" (amahdal)
-- Be more consistent when referring to `%pre` (amahdal)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.34-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jul 13 2021 Brian C. Lane <bcl@redhat.com> - 3.34-1
-- Remove the auth and authconfig commands (pbrezina)
-- The parse method is expected to return a value (vponcova)
-- tests: unittest isn't used in handle_unicode anymore (bcl)
-- Add RHEL 9 handler (mkolman)
-  Resolves: rhbz#1966730
-- Add RHEL 9 version for commands that had a RHEL version in the past (mkolman)
-  Related: rhbz#1966730
-- Add RHEL 9 version for BTRFS related commands (mkolman)
-  Related: rhbz#1966730
-
-* Wed Jun 09 2021 Brian C. Lane <bcl@redhat.com> - 3.33-1
-- tests: Use pykickstart/commands relative to the import (bcl)
-  Related: rhbz#1968762
-- Document missing feature '|' for ignoredisk and clearpart (jkonecny)
-- Remove python six library (bcl)
-- Add Fedora 35 support (bcl)
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 3.32-3
-- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.32-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 18 2021 Brian C. Lane <bcl@redhat.com> - 3.32-1
-- Conditionally BuildRequire coverage and sphinx for runtests (bcl)
-  Resolves: rhbz#1916735
-- Change the lilo command removal to use RemovedCommand (vslavik)
-- Change the lilocheck command removal to use RemovedCommand (vslavik)
-- Fix test for the removed "interactive" command (vslavik)
-- Change the langsupport command removal to use RemovedCommand (vslavik)
-- Change the monitor command removal to use RemovedCommand (vslavik)
-- Change the mouse command removal to use RemovedCommand (vslavik)
-- Change the upgrade command removal to use RemovedCommand (vslavik)
-- Fix ksverdiff detection of removed commands (vslavik)
-- Check warnings of the deprecated kickstart commands (vponcova)
-- Remove the install command (vslavik)
-- Remove the deviceprobe command (vslavik)
-- Remove the device command (vslavik)
-- Remove the dmraid command (vslavik)
-- Remove the multipath command (vslavik)
-- Fix deprecation test for removed commands (vslavik)
-- Switch interactive removal to use RemovedCommand (bcl)
-- Add RemovedCommand for removing commands and documenting them (bcl)
-- Remove support for the updates command without an URL (vponcova)
-- Document how to deprecate commands and options (bcl)
-- Remove the ignoredisk --interactive option (vslavik)
-- Remove the partition --active option (vslavik)
-- Deprecate the %traceback section (vslavik)
-- Add missing .coveragerc file (bcl)
-- Switch to using GitHub Actions instead of Travis CI (bcl)
-- Add support for running via tox (bcl)
-- Deprecate the method command (vslavik)
-- Remove the bootloader option --upgrade (vslavik)
-
-* Thu Nov 05 2020 Brian C. Lane <bcl@redhat.com> - 3.31-1
-- Add make to BuildRequires, buildroot is removing it.
-- Deprecate the autostep command (vslavik)
-- Add missing spaces into the message (yurchor)
-- ksshell: Fix indentation in _init_matches (bcl)
-- Mark the level option of the logging command as deprecated (vponcova)
-
-* Tue Sep 29 2020 Brian C. Lane <bcl@redhat.com> - 3.30-1
-- ksshell: Fix traceback and add tests (bcl)
-- fs: Make tmp file creation cross-platform in ksvalidator to support Windows
-
-* Mon Aug 31 2020 Brian C. Lane <bcl@redhat.com> - 3.29-1
-- setup.py: Fix script installation without filename extension (bcl)
-
-* Mon Aug 31 2020 Brian C. Lane <bcl@redhat.com> - 3.28-1
-- Makefile: Add __init__.py with new version to bumpver commit (bcl)
-- tests: Ignore W0707 raise-missing-from warnings (bcl)
-- Add Fedora 34 support (bcl)
-- Add new tests for the harddrive biospart parameter removal (jkonecny)
-- Remove biospart from harddrive command (jkonecny)
-- move dependencies into setup.py and use setuptools (carlos)
-- remove reference to py3 as a requirement (carlos)
-- remove references to nose test framework (carlos)
-- update dist to 18.04 (carlos)
-- add ci test for future py ver (carlos)
-- use new travis-ci syntax (carlos)
-- parser: Remove OrderedSet (bcl)
-- tests: Add a slightly different test for Package.add (bcl)
-- Add pykickstart.__version__ string (bcl)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 07 2020 Brian C. Lane <bcl@redhat.com> - 3.27-1
-- tests: Fix pylint warnings in timezone tests (bcl)
-- Mark --ntpservers and --nontp options of timezone command as deprecated (mkolman)
-- Add the timesource command (mkolman)
-
-* Mon Jun 01 2020 Brian C. Lane <bcl@redhat.com> - 3.26-1
-- Makefile: Fix gpg signature (bcl)
-- Add RHEL8_Repo, RHEL8_RepoData, and RHEL8_Url classes (bcl)
-- pylint: Fix warnings and errors from pylint 2.5.x (bcl)
-- i18n: Use gettext instead of lgettext (bcl)
-- Use W9902 in pylint disable to avoid warnings about _ (bcl)
-- Add python 3.8 to travis.yml (bcl)
-- docs: Fix network.py documentation markup (bcl)
-- docs: versionadded directive needs a blank line after it (bcl)
-- docs: Maintain programmers-guide in the repo (bcl)
-- Makefile: Add creating the detached signature to the release make target (bcl)
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.25-2
-- Rebuilt for Python 3.9
-
-* Tue Apr 07 2020 Brian C. Lane <bcl@redhat.com> - 3.25-1
-- Deprecate `repo --ignoregroups` (jkonecny)
-- Add Fedora 33 support (jkonecny)
-
-* Mon Apr 06 2020 Brian C. Lane <bcl@redhat.com> - 3.24-1
-- Make --url doctext more understandable (jkonecny)
-- Remove url command doc that it's replaced (jkonecny)
-- Add missing information for driverdisk KS command (jkonecny)
-- tests: close the HTTP Server in tests/include.py (bcl)
-- tests: Replace nose with unittest (bcl)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Brian C. Lane <bcl@redhat.com> - 3.23-1
-- tests: pin coverage at the 4.x.x series (bcl)
-- Switch to using Weblate for translations (bcl)
-- po: Remove pykickstart.pot (bcl)
-- gpg sign the git tag (bcl)
-- Cleaning up empty help strings (bcl)
-- tests: Fix the empty description, help, etc. test (bcl)
-- tests: Turn off HTTP logging in Include_URL_TestCase (bcl)
-- tests: Catch warning in Unknown_New_Section_2_TestCase (bcl)
-- tests: Capture stderr output from ksflatten test (bcl)
-- Prefer --utc to --isUtc in timezone for F32 and later (vslavik)
-- Give output in str(F25_Timezone) even without timezone spec (vslavik)
-- Prefer the non-camelCased options for %packages (vslavik)
-- Add test for kickstart option names (vslavik)
-- Add lowercase aliases for camelCased %packages options (vslavik)
-- Commit the new pykickstart.pot when making a release (bcl)
-- Add the rhsm command (mkolman)
-- Fix travis and coverage runs (bcl)
-- Fix pylint unnecessary-pass warnings (bcl)
-- Drop python2 compatibility (jkonecny)
-- Fix check for python zanata client in Makefile (jkonecny)
-- Update versionremoved sphinx extension (bcl)
-
-* Wed Nov 06 2019 Brian C. Lane <bcl@redhat.com> - 3.22-1
-- Enable coveralls.io coverage tracking (bcl)
-- Add tests for ignorebroken packages parameter (jkonecny)
-- Add ignore broken parameter to packages section (#1642013) (jkonecny)
-- Add support for the ZIPL Secure Boot for F32 and RHEL8 (vponcova)
-- Add F32 support (jkonecny)
-- Add note for the repo and url ssl options (jkonecny)
-- Skip FailsToOpenOutputFile_TestCase if running as root (juliana.rodrigueiro)
-- Change .spec Source to new pykickstart organization URL (bcl)
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.21-3
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.21-2
-- Rebuilt for Python 3.8
-
-* Wed Aug 14 2019 David Cantrell <dcantrell@redhat.com> - 3.21-1
-- Make module --disable available on Fedora 31+ (mkolman)
-- Add F31 handler (mkolman)
-- Add the --disable option for the module command (#1719347) (mkolman)
-- A couple fixes for %packaging section docs (mkolman)
-- Fix the docs generation (vponcova)
-- Fix the documentation of bootloader --append (vponcova)
-- Just kidding, use xenial for everything. (dcantrel)
-- Python 3.7 is only available in 'xenial' in Travis-CI (dcantrel)
-- Reduce .travis.yml to Python 3.{5,6,7}, set SPHINXAPIDOC (dcantrel)
-- Replace PYTHONPATH override with sys.path.append; allow
-  SPHINXAPIDOC (dcantrel)
-- Add rhel7-branch to .travis.yml (dcantrel)
-- Restrict the branches to test with Python 3. (dcantrel)
-- More changes to .travis.yml, add requirements.txt file (dcantrel)
-- Update the Travis-CI yaml file. (dcantrel)
-- Fix documentation for the --excludepkgs and --includepkgs repo
-  options (mkolman)
-- packit.yml: remove unused content (ttomecek)
-- Update sed in pykistart.spec Makefile target (phracek)
-- Add pykickstart.spec.in for packit (phracek)
-- Make %packages --default attribute sane (jkonecny)
-- Configuration file .packit.yaml (phracek)
-- For Travis-CI, explicitly use Sphinx 1.7.6 (dcantrel)
-- Change to unittest.skipUnless and use correct syntax. (dcantrel)
-- Replace 'import unittest.skipIf as skipIf' with
-  just 'import unittest' (dcantrel)
-- s/unittest/pytest/g in .travis.yml (dcantrel)
-- pip install unittest for the Travis-CI runs (dcantrel)
-- Run 'git checkout' in the Makefile ignoring non-fatal errors (dcantrel)
-- Skip KS_With_Wrong_Permissions_TestCase if running as root. (dcantrel)
-- Treat pylint warnings as non-fatal, exit codes 0 and 4. (dcantrel)
-- Remove unused falsePositives in runpylint.py (dcantrel)
-- Use env to set NOSE_IGNORE_CONFIG_FILES (dcantrel)
-- Add NOSE_IGNORE_CONFIG_FILES=y to the .travis.yml file (dcantrel)
-- Set NOSE_IGNORE_CONFIG_FILES in make coverage (dcantrel)
-- In the Travis-CI environment, coverage is 'coverage' (dcantrel)
-- Close output_path after reading in ksflatten.py (dcantrel)
-- Makefile improvements (dcantrel)
-- Specify Python 3.7 in .travis.yml per the docs. (dcantrel)
-- Run sphinx-build and sphinx-apidoc from docs/Makefile (dcantrel)
-- Add some missing help strings as detected by the coverage target. (dcantrel)
-- Add missing descriptions to a handful of pykickstart commands. (dcantrel)
-- Mark the sshkey --username option as required in docs (mkolman)
-- Test on recent Python versions on Travis (mkolman)
-- Fix snapshot documentation (jkonecny)
-- Add a CONTRIBUTING file. (dcantrel)
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Mar 07 2019 David Cantrell <dcantrell@redhat.com> - 3.20-3
-- Remove the Python 2 subpackage for pykickstart (#1686380)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 29 2019 David Cantrell <dcantrell@redhat.com> - 3.20-1
-- New release: 3.20 (dcantrell)
-- Fix backward compatibility for python2 (jkonecny)
-- In 'make local', create a dummy .asc file explaining the
-  signature. (dcantrell)
-
-* Mon Jan 28 2019 David Cantrell <dcantrell@redhat.com> - 3.19-1
-- New release: 3.19 (dcantrell)
-- Run gen_commands_docs and gen_sections_docs with python3. (dcantrell)
-- Use python3-sphinx in docs/Makefile (dcantrell)
-- Nope, this way for make po-pull and make release. (dcantrell)
-- Make sure 'make release' runs 'make po-pull' (dcantrell)
-- RHEL8Handler: include ssl certificate options (lars)
-- Add options for ssl certs on url and repo commands (lars)
-- parser: use collections.abc to import Iterator (lars)
-- test: Remove unused import (lars)
-- tests: Fix ksflatten tests (lars)
-- tests: Remove KickstartValueError test case (lars)
-- tests: Remove test case that's actually valid (lars)
-- Fix pylint warning W0102 dangerous-default-value (lars)
-- docs/versionremoved: fix sphinx import path (lars)
-- travis: don't override PYTHON with /usr/bin/python3 (lars)
-- Refactor ksverdiff and add tests for it (atodorov)
-- Patch ksverdiff so it works with argparse (atodorov)
-- Add main() function to scripts to allow module to be imported (atodorov)
-- Refactor tools/ksflatten.py and add tests for it (atodorov)
-- Add more tests for load.py (atodorov)
-- Issue DeprecationWarning for KickstartValueError and test it for
-  completeness (atodorov)
-- More test coverage for autopart (atodorov)
-- Improve tests for updates (atodorov)
-- Improved tests for timezone (atodorov)
-- Improve tests for selinux (atodorov)
-- Improve test for rootpw (atodorov)
-- Refactoring for reboot.py and more tests (atodorov)
-- Refactor monitor.py and add more tests (atodorov)
-- Add more tests for logvol.py (atodorov)
-- Refactoring for driverdisk.py (atodorov)
-- Refactor and more tests for btrfs.py (atodorov)
-- Add test to kill remaining mutant (atodorov)
-- Refactor in dmraid.py (atodorov)
-- More tests and refactoring for volgroup.py (atodorov)
-- Improve displaymode tests (atodorov)
-- Fix the kickstart section %packages (vponcova)
-- Fix versions in parsers of kickstart sections (vponcova)
-- Fix warnings for deprecated options of kickstart commands (vponcova)
-- Fix pylint errors (vponcova)
-- Update kickstart-docs.rst (jason.gerfen)
-- Kickstart usage example link (jason.gerfen)
-- Document module stream installation (mkolman)
-- Mention all man pages in all "SEE ALSO" sections (tim)
-- Fix typo in ksshell man page (tim)
-- Normalize the mount point (vponcova)
-- Clarify the --when= parameter error message. (dcantrell)
-
-* Wed Aug 29 2018 Chris Lumens <clumens@redhat.com> - 3.18-1
-- New release: 3.18 (clumens)
-- Use the RHEL8 handler to generate RHEL docs. (clumens)
-- Add missing trailing newline for syspurpose __str__ method (mkolman)
-- Add the syspurpose command (mkolman)
-- Fix 'make rpmlog' target. (dcantrell)
-
-* Wed Aug 15 2018 David Cantrell <dcantrell@redhat.com> - 3.17-1
-- New release: 3.17 (dcantrell)
-- Add authselect command to rhel8 handler (rvykydal)
-- Add module command to rhel8 handler (rvykydal)
-- Update po/pykickstart.pot (dcantrell)
-
-* Thu Aug 09 2018 David Cantrell <dcantrell@redhat.com> - 3.16-1
-- New release: 3.16 (dcantrell)
-- Remove the extra space from the logvol command (vponcova)
-- Support LUKS2 in the raid command (vponcova)
-- Support LUKS2 in the part command (vponcova)
-- Support LUKS2 in the logvol command (vponcova)
-- Support LUKS2 in the autopart command (vponcova)
-- Remove unused false positive (vponcova)
-- Wrong hanging indentation (vponcova)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Chris Lumens <clumens@redhat.com> - 3.15-1
-- New release: 3.15 (clumens)
-- Add nvdimm command to RHEL7 (rvykydal)
-- Fix tests timeout (vponcova)
-- Fix pylint errors (vponcova)
-- The deprecated command upgrade is removed in another handler (vponcova)
-- The partition option --active is deprecated in another handler (vponcova)
-- The ignoredisk option --interactive is deprecated in another handler (vponcova)
-- The bootloader option --upgrade is deprecated in another handler (vponcova)
-- The command install is deprecated in another handler (vponcova)
-- The command deviceprobe is deprecated in another handler (vponcova)
-- Add kickstart warnings (vponcova)
-- Add the enablemodule command (mkolman)
-- Remove translation-canary wrapper for xgettext command. (dcantrell)
-- Use 'New release:' in the 'make bumpver' commit messages. (dcantrell)
-- Update the 'make pypi' target. (dcantrell)
-- Include the _sortCommand to the _setCommand method (#1578930) (vponcova)
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 3.14-3
-- Rebuilt for Python 3.7
-
-* Tue May 22 2018 David Cantrell <dcantrell@redhat.com> - 3.14-2
+* Tue May 22 2018 David Cantrell <dcantrell@redhat.com> - 3.12-4
 - Include the _sortCommand to the _setCommand method (vponcova, #1578930)
 - Remove call to xgettext_werror.sh during build
 
-* Mon May 14 2018 David Cantrell <dcantrell@redhat.com> - 3.14-1
-- Increment version to 3.14 (dcantrell)
-- Commit the new version in make bumpver. (dcantrell)
-- Adjust the make release target. (dcantrell)
-- Fix path problem in the pypi target. (dcantrell)
-- Adjust zanata check in po-pull Makefile target. (dcantrell)
-- Document that lilo and lilocheck are deprecated (vponcova)
-- Document that the command mouse is deprecated (vponcova)
-- The deprecated command upgrade is removed (vponcova)
-- The partition option --active is deprecated (vponcova)
-- The ignoredisk option --interactive is deprecated (vponcova)
-- The bootloader option --upgrade is deprecated (vponcova)
-- The command install is deprecated (vponcova)
-- The command deviceprobe is deprecated (vponcova)
-- Add Fedora 29 support (vponcova)
-- Change the timeout for nosetests (vponcova)
-- Fix deprecated commands with data (vponcova)
+* Mon Apr 16 2018 David Cantrell <dcantrell@redhat.com> - 3.12-3
+- Upstream patches to support '--autovlan' option on fcoe command (#1564096)
 
-* Thu May 10 2018 David Cantrell <dcantrell@redhat.com> - 3.13-1
-- Prepare for 3.13 release. (dcantrell)
-- Adjust the make release target. (dcantrell)
-- Fix path problem in the pypi target. (dcantrell)
-- Adjust zanata check in po-pull Makefile target. (dcantrell)
-- Update fcoe command help (rvykydal)
-- Add support for fcoe --autovlan (rvykydal)
-- Fix the writePriority test for the new nvdimm command. (clumens)
-- Fix a typo in the nvdimm command help output. (clumens)
-- Add use action to nvdimm command. (rvykydal)
-- Add nvdimm command (rvykydal)
-- Remove the spec file from the source repo. (clumens)
-- No longer reference the spec file in the Makefile. (clumens)
-- Change the rc-release target to not assume the spec file location. (clumens)
-- Get the version number from setup.py instead of the spec file. (clumens)
-- Remove PKGNAME from the Makefile. (clumens)
-
-* Thu Apr 19 2018 David Cantrell <dcantrell@redhat.com> - 3.12-5
-- BuildRequires: python2-ordered-set
-
-* Mon Apr 16 2018 David Cantrell <dcantrell@redhat.com> - 3.12-4
-- Fix python2 subpackage builds. (#1564347)
+* Mon Apr 16 2018 David Cantrell <dcantrell@redhat.com> - 3.12-2
+- Re-enable python2 subpackage builds. (#1564347)
 - Disable tests by default because they fail in mock right now.
-
-* Thu Apr 12 2018 David Cantrell <dcantrell@redhat.com> - 3.12-3
-- Re-enable the python2 subpackages on Fedora for now.  Some
-  programs still need it and have not moved to python3 yet. (#1564347)
-
-* Mon Apr 02 2018 David Cantrell <dcantrell@redhat.com> - 3.12-2
 - Conditionalize out python2 subpackage builds on Fedora releases
   after 28 and EL releases after 7
 

sources

@@ -1,2 +1 @@
-SHA512 (pykickstart-3.68.tar.gz) = 103034f2ad47afa470066b4c98092ac634c5c5ed21c1c98a65170c78cc86e95f5565bb4c29a24a890836e45d2094b529fcdb02f8a004875cc13db505bd2ba51e
-SHA512 (pykickstart-3.68.tar.gz.asc) = 33d2e3ea50bdffdb7bc4939b68c3069d6fce6087cd186ac57773981928a090608f7509fd8f63bacbbd6544d828da3eb1e1fb785f5ff7e547364c9cd360eaf106
+SHA512 (pykickstart-3.12.tar.gz) = 623e8b3059a204315c34dab8ed972a06a13ce82861db0c27f130f4884edfe2512170ab8c7b5165dbff5a80775364fdb0d4216c6f7735aded31304cdea65139c5

tests/bad-ks/fedora-disk-base.ks

@@ -1,47 +0,0 @@
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-selinux --enforcing
-firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-bootloader --timeout=1
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-repo --name "packages" --url https://nowhere/
-
-%packages
-@core
-@standard
-@hardware-support
-
-kernel
-# on 32bit arm make sure we only install one kernel
--kernel-lpae
-# remove this in %post
-dracut-config-generic
--dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
-chrony
-bcm283x-firmware
-initial-setup
-# Intel wireless firmware assumed never of use for disk images
--iwl*
--ipw*
--usb_modeswitch
--generic-release*
-
-# make sure all the locales are available for inital-setup and anaconda to work
-glibc-all-langpacks
-
-%end

tests/bad-ks/no-commands.ks

@@ -1,2 +0,0 @@
-echo "not a kickstart"
-without any --commands

tests/good-ks/fedora-disk-base.ks

@@ -1,104 +0,0 @@
-# fedora-disk-base.ks
-#
-# Defines the basics for all kickstarts in the fedora-live branch
-# Does not include package selection (other then mandatory)
-# Does not include localization packages or configuration
-#
-# Does includes "default" language configuration (kickstarts including
-# this template can override these settings)
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-selinux --enforcing
-firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-bootloader --timeout=1
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-%include fedora-repo.ks
-
-%packages
-@core
-@standard
-@hardware-support
-
-kernel
-# on 32bit arm make sure we only install one kernel
--kernel-lpae
-# remove this in %post
-dracut-config-generic
--dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
-chrony
-bcm283x-firmware
-initial-setup
-# Intel wireless firmware assumed never of use for disk images
--iwl*
--ipw*
--usb_modeswitch
--generic-release*
-
-# make sure all the locales are available for inital-setup and anaconda to work
-glibc-all-langpacks
-
-%end
-
-%post
-
-# Find the architecture we are on
-arch=$(uname -m)
-
-# Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
-fi
-
-releasever=$(rpm --eval '%{fedora}')
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
-echo "Packages within this disk image"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-
-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
-# The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
-
-dnf -y remove dracut-config-generic
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
-# when you are using fedora via serial console as you do not get any output post grub
-# linux does a good job of knowing what consoles need to be enabled.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2022757
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
-fi
-
-%end

tests/good-ks/fedora-live-base.ks

@@ -1,106 +0,0 @@
-# fedora-live-base.ks
-#
-# Defines the basics for all kickstarts in the fedora-live branch
-# Does not include package selection (other then mandatory)
-# Does not include localization packages or configuration
-#
-# Does includes "default" language configuration (kickstarts including
-# this template can override these settings)
-
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-selinux --enforcing
-firewall --enabled --service=mdns
-xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-%include fedora-repo.ks
-
-%packages
-# Explicitly specified here:
-# <notting> walters: because otherwise dependency loops cause yum issues.
-kernel
-kernel-modules
-kernel-modules-extra
-
-# The point of a live image is to install
-anaconda
-anaconda-install-env-deps
-anaconda-live
-@anaconda-tools
-# Anaconda has a weak dep on this and we don't want it on livecds, see
-# https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
--fcoe-utils
--device-mapper-multipath
-
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
-
-# Without this, initramfs generation during live image creation fails: #1242586
-dracut-live
-
-# anaconda needs the locales available to run for different locales
-glibc-all-langpacks
-
-# provide the livesys scripts
-livesys-scripts
-%end
-
-%post
-# Enable livesys services
-systemctl enable livesys.service
-systemctl enable livesys-late.service
-
-# enable tmpfs for /tmp
-systemctl enable tmp.mount
-
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
-cat >> /etc/fstab << EOF
-vartmp   /var/tmp    tmpfs   defaults   0  0
-EOF
-
-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-echo "Packages within this LiveCD"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# go ahead and pre-make the man -k cache (#455968)
-/usr/bin/mandb
-
-# make sure there aren't core files lying around
-rm -f /core*
-
-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
-# convince readahead not to collect
-# FIXME: for systemd
-
-echo 'File created by kickstart. See systemd-update-done.service(8).' \
-    | tee /etc/.updated >/var/.updated
-
-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# See bug 1317709
-rm -f /boot/*-rescue*
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-systemctl disable network
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
-

tests/include-ks/fedora-live-base.ks

@@ -1,106 +0,0 @@
-# fedora-live-base.ks
-#
-# Defines the basics for all kickstarts in the fedora-live branch
-# Does not include package selection (other then mandatory)
-# Does not include localization packages or configuration
-#
-# Does includes "default" language configuration (kickstarts including
-# this template can override these settings)
-
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-selinux --enforcing
-firewall --enabled --service=mdns
-xconfig --startxonboot
-zerombr
-clearpart --all
-##part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-%include fedora-repo.ks
-
-%packages
-# Explicitly specified here:
-# <notting> walters: because otherwise dependency loops cause yum issues.
-kernel
-kernel-modules
-kernel-modules-extra
-
-# The point of a live image is to install
-anaconda
-anaconda-install-env-deps
-anaconda-live
-@anaconda-tools
-# Anaconda has a weak dep on this and we don't want it on livecds, see
-# https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
--fcoe-utils
--device-mapper-multipath
-
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
-
-# Without this, initramfs generation during live image creation fails: #1242586
-dracut-live
-
-# anaconda needs the locales available to run for different locales
-glibc-all-langpacks
-
-# provide the livesys scripts
-livesys-scripts
-%end
-
-%post
-# Enable livesys services
-systemctl enable livesys.service
-systemctl enable livesys-late.service
-
-# enable tmpfs for /tmp
-systemctl enable tmp.mount
-
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
-cat >> /etc/fstab << EOF
-vartmp   /var/tmp    tmpfs   defaults   0  0
-EOF
-
-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-echo "Packages within this LiveCD"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# go ahead and pre-make the man -k cache (#455968)
-/usr/bin/mandb
-
-# make sure there aren't core files lying around
-rm -f /core*
-
-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
-# convince readahead not to collect
-# FIXME: for systemd
-
-echo 'File created by kickstart. See systemd-update-done.service(8).' \
-    | tee /etc/.updated >/var/.updated
-
-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# See bug 1317709
-rm -f /boot/*-rescue*
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-systemctl disable network
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
-

tests/include-ks/fedora-live-minimization.ks

@@ -1,9 +0,0 @@
-# Common packages removed from comps
-# For F14, these removals should be moved to comps itself
-
-%packages
-
-# save some space
--hplip
-
-%end

tests/include-ks/fedora-live-xfce.ks

@@ -1,33 +0,0 @@
-# fedora-livecd-xfce.ks
-#
-# Description:
-# - Fedora Live Spin with the light-weight XFCE Desktop Environment
-#
-# Maintainer(s):
-# - Rahul Sundaram    <sundaram@fedoraproject.org>
-# - Christoph Wickert <cwickert@fedoraproject.org>
-# - Kevin Fenzi       <kevin@tummy.com>
-# - Adam Miller       <maxamillion@fedoraproject.org>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-xfce-common.ks
-
-# need a bigger /
-part / --size 6144
-
-%post
-# xfce configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/startxfce4
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
-
-%end
-

tests/include-ks/fedora-repo-rawhide.ks

@@ -1,2 +0,0 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

tests/include-ks/fedora-repo.ks

@@ -1,9 +0,0 @@
-# Include the appropriate repo definitions
-
-# Exactly one of the following should be uncommented
-
-# For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
-
-# For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks

tests/include-ks/fedora-xfce-common.ks

@@ -1,34 +0,0 @@
-# fedora-livecd-xfce.ks
-#
-# Description:
-# - Fedora Live Spin with the light-weight XFCE Desktop Environment
-#
-# Maintainer(s):
-# - Kevin Fenzi       <kevin@tummy.com>
-# - Adam Miller       <maxamillion@fedoraproject.org>
-# - Mukundan Ragavan  <nonamedotc@fedoraproject.org>
-
-%packages
-
-fedora-release-xfce
-# install env-group to resolve RhBug:1891500
-@^xfce-desktop-environment
-
-@xfce-apps
-@xfce-extra-plugins
-@xfce-media
-@xfce-office
-
-wget
-system-config-printer
-
-# save some space
--autofs
--acpid
--gimp-help
--desktop-backgrounds-basic
--aspell-*                   # dictionaries are big
--xfce4-sensors-plugin
--xfce4-eyes-plugin
-
-%end

tests/scripts/run_tests.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-echo "Running pykickstart tests"
-cd ./tests/
-
-# Run ksvalidator on good kickstart examples
-for f in ./good-ks/*.ks; do
-    echo "Checking $f"
-    ksvalidator $f || exit 1
-done
-
-# Run ksvalidator on bad kickstart examples
-for f in ./bad-ks/*.ks; do
-    echo "Checking $f"
-    ksvalidator $f && exit 1
-done
-
-
-# Run ksflatten on a set of kickstarts
-echo "Testing ksflatten with included kickstarts"
-ksflatten -c ./include-ks/fedora-live-xfce.ks -o flat.ks || exit 1
-ksvalidator flat.ks || exit 1
-
-exit 0