Update setuptools and tox configuration

We also run integration and unit tests into single Zuul job
to save resources.

Partially closes https://issues.redhat.com/browse/RDO-422

Change-Id: Iafb2e26895d19bc65a722c6cd5e7bc903791fb11

Author: jcapiitao

.zuul.yaml

@@ -4,51 +4,31 @@
     parent: tox
     abstract: true
     pre-run: playbooks/base.yaml
+    nodeset:
+      nodes:
+        - name: cloud-centos-9-stream
+          label: cloud-centos-9-stream
 
 - job:
-    name: distroinfo-base-py2
+    name: distroinfo-py39
     parent: distroinfo-base
-    abstract: true
-    nodeset: centos-latest-pod
+    description: distroinfo tests on py3.9
+    vars:
+      tox_envlist: py39
 
 - job:
-    name: distroinfo-base-py3
+    name: distroinfo-py312
     parent: distroinfo-base
-    abstract: true
+    description: distroinfo tests on py3.12
     nodeset: fedora-latest-pod
-
-- job:
-    name: distroinfo-py2-centos
-    parent: distroinfo-base-py2
-    description: distroinfo tests on python2
-    vars:
-      tox_envlist: py2-unit
-
-- job:
-    name: distroinfo-py3-fedora
-    parent: distroinfo-base-py3
-    description: distroinfo tests on python3
     vars:
-      tox_envlist: py3-unit
-
-- job:
-    name: distroinfo-py2-integration
-    parent: distroinfo-base-py2
-    description: distroinfo integration tests with rdoinfo
-    vars:
-      tox_envlist: py2-integration
-
-- job:
-    name: distroinfo-py3-integration
-    parent: distroinfo-base-py3
-    description: distroinfo integration tests with rdoinfo
-    vars:
-      tox_envlist: py3-integration
+      tox_envlist: py312
 
 - job:
     name: distroinfo-codestyle
-    parent: distroinfo-base-py2
+    parent: distroinfo-base
     description: distroinfo code style checks
+    nodeset: fedora-latest-pod
     vars:
       tox_envlist: pycodestyle
 
@@ -59,8 +39,8 @@
     run: playbooks/dlrn-master.yaml
     nodeset:
       nodes:
-        - name: rdo-centos-8-stream
-          label: rdo-centos-8-stream
+        - name: cloud-centos-9-stream
+          label: cloud-centos-9-stream
 
     required-projects:
       - DLRN
@@ -69,18 +49,14 @@
     name: distroinfo
     check:
       jobs:
-        - distroinfo-py2-centos
-        - distroinfo-py3-fedora
-        - distroinfo-py2-integration
-        - distroinfo-py3-integration
+        - distroinfo-py39
+        - distroinfo-py312
         - distroinfo-codestyle
         - distroinfo-dlrn-master
     gate:
       jobs:
-        - distroinfo-py2-centos
-        - distroinfo-py3-fedora
-        - distroinfo-py2-integration
-        - distroinfo-py3-integration
+        - distroinfo-py39
+        - distroinfo-py312
         - distroinfo-codestyle
         - distroinfo-dlrn-master
     release:

playbooks/dlrn-master.yaml

@@ -6,23 +6,26 @@
     - name: Prepare virtualenv to test DLRN master
       shell:
         cmd: |
-          tox -e py36 --notest
+          tox -e py39 --notest
         chdir: "{{ working_dir }}/DLRN"
+
     - name: Inject distroinfo into DLRN master virtualenv
       shell:
         cmd: |
-          . ../DLRN/.tox/py36/bin/activate
-          python setup.py install
+          . ../DLRN/.tox/py39/bin/activate
+          pip install .
         chdir: "{{ working_dir }}/distroinfo"
+
     - name: Run DLRN master tests with distroinfo
       shell:
         cmd: |
           export TAG=""
-          export TARGET="centos8"
+          export TARGET="centos9"
           export ZUUL_BRANCH="rpm-master"
-          export PYTHON_VERSION=py36
-          timeout --signal=SIGKILL 3600 ./scripts/run_tests.sh http://review.rdoproject.org/r/rdoinfo.git ${TARGET} https://trunk.rdoproject.org/centos8/
+          export PYTHON_VERSION=py39
+          timeout --signal=SIGKILL 3600 ./scripts/run_tests.sh http://review.rdoproject.org/r/rdoinfo.git ${TARGET} https://trunk.rdoproject.org/centos9/
         chdir: "{{ working_dir }}/DLRN"
+
     - name: Copy DLRN logs for collection
       shell:
         cmd: |

requirements.txt

@@ -1,35 +1,49 @@
 [metadata]
 name = distroinfo
 summary = python module for parsing, validating and querying distribution/packaging metadata stored in human readable and reviewable text/YAML files
-description-file = README.rst
+description_file = README.rst
 long_description_content_type = text/x-rst
 license = Apache Software License
 classifiers =
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
+    Programming Language :: Python :: 3.14
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
 author = Jakub Ruzicka
-author-email = [email protected]
-home-page = https://github.com/softwarefactory-project/distroinfo
+author_email = [email protected]
+home_page = https://github.com/softwarefactory-project/distroinfo
 keywords =
 
-[global]
-setup-hooks = pbr.hooks.setup_hook
+[options]
+python_requires = >=3.9
+packages = find:
+include_package_data = true
+install_requires =
+    pbr>=6.0.0
+    PyYAML
+    requests
+    six
+
+[options.extras_require]
+tests =
+    pytest
+    pycodestyle
 
 [files]
 packages =
     distroinfo
 
-[aliases]
-test = pytest
-
 [pycodestyle]
+# E123, E125 skipped as they are invalid PEP-8.
+ignore = E123,E125
+show-source = True
 exclude = build,lib,.tox,third,*.egg,docs,packages,.eggs

setup.cfg

@@ -1,25 +1,6 @@
 #!/usr/bin/env python
-
-import re
 import setuptools
-import sys
-
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
-
-# Only require pytest_runner for setup when testing. This uses the
-# recommendation from
-# https://pypi.org/project/pytest-runner/#conditional-requirement
-needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-pytest_runner = ['pytest-runner'] if needs_pytest else []
 
 setuptools.setup(
-    setup_requires=['pbr'] + pytest_runner,
-    tests_require=['pytest'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

setup.py

@@ -14,9 +14,9 @@ package-configs:
   rdo-dependency:
     # This is the conf for dependencies in rdo-common not being entirely managed
     # in review.r.o but using cbs-tags for automatic tagging
-    distgit: http://review.rdoproject.org/r/deps/%(project)s.git
+    distgit: https://review.rdoproject.org/r/deps/%(project)s.git
     patches:
-    master-distgit: http://review.rdoproject.org/r/deps/%(project)s.git
+    master-distgit: https://review.rdoproject.org/r/deps/%(project)s.git
     review-patches:
     review-origin:
     tags:

test-requirements.txt

@@ -75,7 +75,7 @@ def assert_rdoinfo_deps(info):
         'conf': 'rdo-dependency',
         'upstream': 'https://github.com/sphinx-doc/sphinx',
         'patches': None,
-        'distgit': 'http://review.rdoproject.org/r/deps/python-sphinx.git'
+        'distgit': 'https://review.rdoproject.org/r/deps/python-sphinx.git'
     }
     assert_dict_contains(pkg, expected=sphinx)
     assert 'tags' in pkg

tests/assets/info/rdoinfo/deps.yml

@@ -18,9 +18,9 @@ def test_attr_diff_base():
             pkg['upstream'] = 'https://opendev.org/openstack/foo'
 
     diff = query.attr_diff(info, info2, 'upstream')
-    assert(len(diff) == 1)
-    assert(diff[0][0] == 'openstack-nova')
-    assert(diff[0][1] == 'https://opendev.org/openstack/foo')
+    assert (len(diff) == 1)
+    assert (diff[0][0] == 'openstack-nova')
+    assert (diff[0][1] == 'https://opendev.org/openstack/foo')
 
 
 def test_attr_diff_nochanges():
@@ -29,7 +29,7 @@ def test_attr_diff_nochanges():
     info = di.get_info()
     info2 = copy.deepcopy(info)
     diff = query.attr_diff(info, info2, 'upstream')
-    assert(len(diff) == 0)
+    assert (len(diff) == 0)
 
 
 def test_attr_diff_nosuchattr():
@@ -43,7 +43,7 @@ def test_attr_diff_nosuchattr():
             pkg['upstream'] = 'https://opendev.org/openstack/foo'
 
     diff = query.attr_diff(info, info2, 'fooattr')
-    assert(len(diff) == 0)
+    assert (len(diff) == 0)
 
 
 def test_attr_diff_newpkg():
@@ -59,9 +59,9 @@ def test_attr_diff_newpkg():
     info2['packages'].append(newpkg)
 
     diff = query.attr_diff(info, info2, 'master-distgit')
-    assert(len(diff) == 1)
-    assert(diff[0][0] == 'openstack-newproject')
-    assert(diff[0][1] == 'https://github.com/rdo-packages/new-distgit')
+    assert (len(diff) == 1)
+    assert (diff[0][0] == 'openstack-newproject')
+    assert (diff[0][1] == 'https://github.com/rdo-packages/new-distgit')
 
 
 def test_attr_diff_2_diffs():
@@ -77,7 +77,7 @@ def test_attr_diff_2_diffs():
             pkg['upstream'] = 'https://opendev.org/openstack/foo-cinder'
 
     diff = query.attr_diff(info, info2, 'upstream')
-    assert(len(diff) == 2)
+    assert (len(diff) == 2)
 
 
 def test_find_element_ok():
@@ -87,8 +87,8 @@ def test_find_element_ok():
     finding = query.find_element(info, 'queens',
                                  info_key='releases')
 
-    assert(finding)
-    assert(finding == info['releases'][1])
+    assert (finding)
+    assert (finding == info['releases'][1])
 
 
 def test_find_element_not_found():
@@ -97,7 +97,7 @@ def test_find_element_not_found():
     info = di.get_info()
     finding = query.find_element(info, 'aabb',
                                  info_key='releases')
-    assert(not finding)
+    assert (not finding)
 
 
 @unittest.skipIf(six.PY2, "Test fails randomly in python2")
@@ -108,8 +108,8 @@ def test_find_element_in_sub_dict_list():
     finding = query.find_element(info, 'cloud7-openstack-rocky-testing',
                                  info_key='releases')
 
-    assert(finding)
-    assert(finding == info['releases'][0])
+    assert (finding)
+    assert (finding == info['releases'][0])
 
 
 def test_single_filter_pkgs_found():
@@ -121,9 +121,9 @@ def test_single_filter_pkgs_found():
     rexen = {"project": "keystonemiddleware"}
     finding = query.filter_pkgs(pkgs, rexen)
 
-    assert(isinstance(finding, list))
-    assert(len(finding) == 1)
-    assert("keystonemiddleware" in finding[0]["name"])
+    assert (isinstance(finding, list))
+    assert (len(finding) == 1)
+    assert ("keystonemiddleware" in finding[0]["name"])
 
 
 def test_multiple_filter_found():
@@ -136,8 +136,8 @@ def test_multiple_filter_found():
     finding = query.filter_pkgs(pkgs, rexen)
 
     # expected number of foung pkgs is 2
-    assert(isinstance(finding, list))
-    assert(len(finding) == 2)
+    assert (isinstance(finding, list))
+    assert (len(finding) == 2)
 
 
 def test_filter_pkgs_not_found():
@@ -150,8 +150,8 @@ def test_filter_pkgs_not_found():
     finding = query.filter_pkgs(pkgs, rexen)
 
     # no package should be found
-    assert(isinstance(finding, list))
-    assert(len(finding) == 0)
+    assert (isinstance(finding, list))
+    assert (len(finding) == 0)
 
 
 def test_exclusion_filter_found():
@@ -163,7 +163,7 @@ def test_exclusion_filter_found():
 
     finding = query.filter_pkgs(pkgs, rexen)
 
-    assert(finding)
-    assert(isinstance(finding, list))
-    assert(len(finding) == 1)
-    assert("newton" not in finding[0]["tags"])
+    assert (finding)
+    assert (isinstance(finding, list))
+    assert (len(finding) == 1)
+    assert ("newton" not in finding[0]["tags"])