Merge lp:~verterok/ols-tests/drop-python2 into lp:ols-tests

[Guillermo Gonzalez]

Drop python 2 and updates related to make things work in newer Python 3

[Maximiliano Bertacchini (maxiberta)]

+1

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed.
https://jenkins.ols.ps5.canonical.com/job/ols-tests/7/

[lp:~verterok/ols-tests/drop-python2]

233. By Guillermo Gonzalez on 2024-08-30

use focal as default release, update ols-vms.conf

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed.
https://jenkins.ols.ps5.canonical.com/job/ols-tests/8/

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-22 13:18:32 +0000
+++ debian/changelog	2024-08-30 14:01:32 +0000
@@ -1,3 +1,9 @@
+ols-tests (1.0.3) unstable; urgency=medium
+
+  * Drop Python 2 support
+
+ -- Guillermo Gonzalez <[e-mail]>  Wed, 07 Jun 2023 21:31:04 +0000
+
 ols-tests (1.0.2) unstable; urgency=medium
 
   * Fix pep8 dep broken by the previous pyflakes fix.

=== modified file 'debian/control'
--- debian/control	2016-07-22 13:18:32 +0000
+++ debian/control	2024-08-30 14:01:32 +0000
@@ -4,44 +4,23 @@
 Standards-Version: 3.9.8
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Vincent Ladeuil <[e-mail]>
-# Starting with ubuntu xenial, pep8 has been split between python-pep8 (module)
-# and pep8 (script but for python3 !). We only need the module.
-# For pyflakes, xenial split python-pyflakes and python3-pyflakes
 Build-Depends: debhelper (>= 9),
                dh-python,
-               python-pep8 | pep8 (<< 1.6.2-0.1ubuntu2),
-               python3-pyflakes | pyflakes,
-               python-pyflakes  | pyflakes,
-               python-all,
-               python-subunit,
-               python-testtools,
-               python-setuptools,
+               python3-pyflakes | pyflakes3,
                python3-all,
+               python3-distro,
                python3-pep8,
                python3-setuptools,
                python3-subunit,
                python3-testtools,
 
-Package: python-ols-tests
-Architecture: all
-# Same remark as above regarding python2 pep8
-Depends: python-pep8 | pep8 (<< 1.6.2-0.1ubuntu2),
-         python-pyflakes | pyflakes,
-         python-subunit,
-         python-testtools,
-         ${misc:Depends},
-         ${python:Depends}
-Description: Online Services test tools.
-
 Package: python3-ols-tests
 Architecture: all
-# Either the python3 pyflakes library is its own package or is provided as
-# part of pyflakes (pyflakes3 was introduced later for the python3 script but
-# we don't need nor use it)
-Depends: python3-pyflakes | pyflakes,
+Depends: python3-pyflakes | pyflakes3,
          python3-pep8,
          python3-subunit,
          python3-testtools,
+         python3-distro,
          ${misc:Depends},
          ${python3:Depends}
 Description: Online Services test tools.

=== removed file 'debian/python-ols-tests.install'
--- debian/python-ols-tests.install	2016-02-10 11:44:07 +0000
+++ debian/python-ols-tests.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/python2*
-usr/bin/ols-run-tests2 /usr/bin/

=== removed file 'debian/python3-ols-tests.install'
--- debian/python3-ols-tests.install	2016-02-10 11:44:07 +0000
+++ debian/python3-ols-tests.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/python3*
-usr/bin/ols-run-tests /usr/bin/

=== modified file 'debian/rules'
--- debian/rules	2016-02-08 17:54:01 +0000
+++ debian/rules	2024-08-30 14:01:32 +0000
@@ -2,8 +2,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh "$@" --with python2,python3 --buildsystem=pybuild
+	dh "$@" --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
 	./ols-run-tests
-	./ols-run-tests2

=== modified file 'debian/tests/control'
--- debian/tests/control	2016-07-22 13:18:32 +0000
+++ debian/tests/control	2024-08-30 14:01:32 +0000
@@ -1,5 +1,2 @@
-Tests: upstream2
-Depends: python-ols-tests
-
 Tests: upstream
 Depends: python3-ols-tests

=== removed file 'debian/tests/upstream2'
--- debian/tests/upstream2	2016-02-08 17:54:01 +0000
+++ debian/tests/upstream2	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-ols-run-tests2 -m olstests

=== removed file 'ols-run-tests2'
--- ols-run-tests2	2016-02-08 17:54:01 +0000
+++ ols-run-tests2	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-# -*- Mode: python -*-
-# This file is part of the Online Services test tools
-#
-# Copyright 2015 Canonical Ltd.
-#  
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 3, as published by the
-# Free Software Foundation.
-#  
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#  
-# You should have received a copy of the GNU General Public License along with
-# this program.  If not, see <http://www.gnu.org/licenses/>.
-"""The CLI Ubuntu CI test runner."""
-
-import sys
-
-from olstests import runners
-
-if __name__ == '__main__':
-    sys.exit(runners.cli_run())
-
-

=== modified file 'ols-vms.conf'
--- ols-vms.conf	2017-02-01 16:42:21 +0000
+++ ols-vms.conf	2024-08-30 14:01:32 +0000
@@ -1,29 +1,25 @@
-packages.olstests = bzr, bzr-builddeb, debhelper, python-all, python-subunit, python-testtools, python-setuptools, python3-all, python3-pep8, python3-setuptools, python3-subunit, python3-testtools
-packages.before_xenial =  pep8, pyflakes
-packages.from_xenial = python-pep8, python-pyflakes, python3-pyflakes
+packages.olstests = bzr, bzr-builddeb, debhelper, python3-all, python3-subunit, python3-testtools, python3-setuptools, python3-all, python3-pep8, python3-setuptools, python3-subunit, python3-testtools
+packages.from_xenial = python3-pyflakes, python3-pyflakes
 [ols-tests]
 vm.class = lxd
+vm.release = focal
 vm.update = True
-vm.packages = {packages.olstests},  {packages.before_xenial}
+vm.packages = {packages.olstests}
 vm.published_as = ols-tests/{vm.release}/{vm.architecture}
 
-[ols-tests-trusty]
-vm.release = trusty
-
-[ols-tests-vivid]
-vm.release = vivid
-
-[ols-tests-wily]
-vm.release = wily
 
 [ols-tests-xenial]
 vm.release = xenial
 vm.packages = {packages.olstests}, {packages.from_xenial}
 
-[ols-tests-yakkety]
-vm.release = yakkety
-vm.packages = {packages.olstests}, {packages.from_xenial}
-
-[ols-tests-zesty]
-vm.release = zesty
-lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
+[ols-tests-bionic]
+vm.release = bionic
+vm.packages = {packages.olstests}
+
+[ols-tests-focal]
+vm.release = focal
+vm.packages = {packages.olstests}
+
+[ols-tests-jammy]
+vm.release = jammy
+vm.packages = {packages.olstests}

=== modified file 'olstests/features.py'
--- olstests/features.py	2023-05-01 10:05:24 +0000
+++ olstests/features.py	2024-08-30 14:01:32 +0000
@@ -16,7 +16,7 @@
 """A collection of commonly used 'Features' to optionally run tests."""
 
 from distutils import spawn
-import platform
+import distro
 import unittest
 
 
@@ -85,7 +85,7 @@
         super(PlatformFeature, self).__init__()
         # self.distro structure may vary between distros, the daughter classes
         # handle the differences.
-        self.distro = platform.linux_distribution()
+        self.distro = distro.name(), distro.version(), distro.codename()
 
 
 class UbuntuPlatformFeature(PlatformFeature):
@@ -113,10 +113,10 @@
 
 
 trusty = UbuntuPlatformFeature('trusty')
-utopic = UbuntuPlatformFeature('utopic')
-vivid = UbuntuPlatformFeature('vivid')
-wily = UbuntuPlatformFeature('wily')
 xenial = UbuntuPlatformFeature('xenial')
+bionic = UbuntuPlatformFeature('bionic')
+focal = UbuntuPlatformFeature('focal')
+jammy = UbuntuPlatformFeature('jammy')
 
 
 def requires(feature):

=== modified file 'olstests/fixtures.py'
--- olstests/fixtures.py	2016-02-08 17:54:01 +0000
+++ olstests/fixtures.py	2024-08-30 14:01:32 +0000
@@ -148,7 +148,7 @@
     def test_error(self):
         self.traceback_line = inspect.currentframe().f_lineno + 2
         raise SyntaxError('invalid syntax',
-                          (self.traceback_file, 1, 1, 'No python'))
+                          (self.traceback_file, 1, 1, 'No python', 1, 1))
 
     def test_skip(self):
         self.skipTest('')

=== modified file 'olstests/tests/test_runners.py'
--- olstests/tests/test_runners.py	2016-02-08 17:54:01 +0000
+++ olstests/tests/test_runners.py	2024-08-30 14:01:32 +0000
@@ -287,6 +287,8 @@
         super(TestOptionParsing, self).setUp()
         self.out = StringIO()
         self.err = StringIO()
+        fixtures.override_env(self, 'COLUMNS', '300')
+        fixtures.override_env(self, 'LINES', '300')
 
     def parse_args(self, args):
         ns = runners.RunTestsArgParser().parse_args(args, self.out, self.err)
@@ -296,36 +298,40 @@
         with self.assertRaises(SystemExit):
             self.parse_args(['-h'])
         self.maxDiff = None
-        assertions.assertMultiLineAlmostEqual(self, '''\
-usage: ols-run-tests [-h] [--module MODULE] [--exclude EXCLUDE] [--list]
-                     [--load LOAD_FILE] [--format {text,subunit}]
-                     [--concurrency CONCURRENCY] [--pick PICK]
-                     [INCLUDE [INCLUDE ...]]
+        include_format = "[INCLUDE ...]"
+        options_text = "options:"
+        if not features.jammy.available():
+            include_format = "[INCLUDE [INCLUDE ...]]"
+            options_text = "optional arguments:"
+
+        assertions.assertMultiLineAlmostEqual(self, ('''\
+usage: ols-run-tests [-h] [--module MODULE] [--exclude EXCLUDE] [--list] \
+[--load LOAD_FILE] [--format {{text,subunit}}] [--concurrency CONCURRENCY] \
+[--pick PICK] {}
 
 Load and run tests.
 
 positional arguments:
-  INCLUDE               All tests matching the INCLUDE regexp will be run. Can
-                        be repeated.
+  INCLUDE               All tests matching the INCLUDE regexp will be run. \
+Can be repeated.
 
-optional arguments:
+{}
   -h, --help            show this help message and exit
   --module MODULE, -m MODULE
-                        Load tests from MODULE[:PATH]. MODULE is found in
-                        python path or PATH if specified. Can be repeated.
+                        Load tests from MODULE[:PATH]. MODULE is found in \
+python path or PATH if specified. Can be repeated.
   --exclude EXCLUDE, -X EXCLUDE
-                        All tests matching the EXCLUDE regexp will not be run.
-                        Can be repeated.
+                        All tests matching the EXCLUDE regexp will not be run.\
+ Can be repeated.
   --list, -l            List the tests instead of running them.
-  --load LOAD_FILE      A file name containing test ids to be run in the
-                        specified order.
-  --format {text,subunit}, -f {text,subunit}
+  --load LOAD_FILE      A file name containing test ids to be run in the \
+specified order.
+  --format {{text,subunit}}, -f {{text,subunit}}
                         Output format for the test results.
   --concurrency CONCURRENCY, -c CONCURRENCY
                         concurrency (number of processes).
   --pick PICK           n/m pick nth test every m tests.
-''',
-                                              self.out.getvalue())
+'''.format(include_format, options_text)), self.out.getvalue())
 
     def test_default_values(self):
         ns = self.parse_args([])

=== modified file 'setup.py'
--- setup.py	2016-07-22 13:18:32 +0000
+++ setup.py	2024-08-30 14:01:32 +0000
@@ -22,10 +22,7 @@
 
 
 def get_scripts():
-    if sys.version_info < (3,):
-        return ['ols-run-tests2']
-    else:
-        return ['ols-run-tests']
+    return ['ols-run-tests']
 
 
 setuptools.setup(
@@ -36,9 +33,7 @@
     author_email='[e-mail]',
     url='https://launchpad.net/ols-tests',
     license='GPLv3',
-    # FIXME: We want 'pyflakes' below but this confuses dh_python3 on xenial
-    # (but not on yakkety...) -- vila 2016-07-22
-    install_requires=['pep8', 'python-subunit', 'testtools'],
+    install_requires=['pep8', 'subunit', 'testtools'],
     packages=['olstests', 'olstests.tests'],
     scripts=get_scripts(),
 )