Hello community,

here is the log from the commit of package python-oslotest for openSUSE:Factory 
checked in at 2020-05-28 09:05:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslotest (Old)
 and      /work/SRC/openSUSE:Factory/.python-oslotest.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-oslotest"

Thu May 28 09:05:10 2020 rev:21 rq:803604 version:4.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslotest/python-oslotest.changes  
2020-04-19 21:46:02.563668208 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-oslotest.new.3606/python-oslotest.changes    
    2020-05-28 09:05:15.131327139 +0200
@@ -1,0 +2,20 @@
+Tue May 12 09:51:45 UTC 2020 - [email protected]
+
+- update to version 4.2.0
+  - Update master for stable/train
+  - Remove 'oslotest.functional'
+  - Remove os-client-config and debtcollector
+  - remove outdated header
+  - gitignore: Ignore reno artefacts
+  - tools: Default to Python 3
+  - Switch to Ussuri jobs
+  - Switch to unittest.mock from mock
+  - tox: Trivial cleanup
+  - Remove stestr from requirements.txt
+  - Invoke correct python version in shell scripts
+  - Remove 'oslotest.moxstubout' module
+  - Revert "Switch to unittest.mock from mock"
+  - [ussuri][goal] Drop python 2.7 support and testing
+  - trivial: Cleanup of doc config file
+
+-------------------------------------------------------------------

Old:
----
  oslotest-3.8.1.tar.gz

New:
----
  oslotest-4.2.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-oslotest.spec ++++++
--- /var/tmp/diff_new_pack.bagVlH/_old  2020-05-28 09:05:16.051329897 +0200
+++ /var/tmp/diff_new_pack.bagVlH/_new  2020-05-28 09:05:16.055329909 +0200
@@ -17,22 +17,22 @@
 
 
 Name:           python-oslotest
-Version:        3.8.1
+Version:        4.2.0
 Release:        0
 Summary:        OpenStack test framework
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://launchpad.net/oslotest
-Source0:        
https://files.pythonhosted.org/packages/source/o/oslotest/oslotest-3.8.1.tar.gz
+Source0:        
https://files.pythonhosted.org/packages/source/o/oslotest/oslotest-4.2.0.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  python3-debtcollector >= 1.2.0
+BuildRequires:  python3-debtcollector
 BuildRequires:  python3-fixtures >= 3.0.0
 BuildRequires:  python3-mock >= 2.0.0
-BuildRequires:  python3-mox3 >= 0.20.0
+BuildRequires:  python3-mox3
 BuildRequires:  python3-pbr
 BuildRequires:  python3-python-subunit >= 1.0.0
 BuildRequires:  python3-six >= 1.10.0
-BuildRequires:  python3-stestr >= 2.0.0
+BuildRequires:  python3-stestr
 BuildRequires:  python3-testtools >= 2.2.0
 BuildArch:      noarch
 
@@ -43,15 +43,15 @@
 %package -n python3-oslotest
 Summary:        OpenStack test framework
 Group:          Development/Languages/Python
-Requires:       python3-debtcollector >= 1.2.0
+Requires:       python3-debtcollector
 Requires:       python3-fixtures >= 3.0.0
 Requires:       python3-mock >= 2.0.0
-Requires:       python3-mox3 >= 0.20.0
+Requires:       python3-mox3
 # NOTE: python-os-client-config is only needed for functional testing
-# Requires:       python3-os-client-config >= 1.28.0
+# Requires:       python3-os-client-config
 Requires:       python3-python-subunit >= 1.0.0
 Requires:       python3-six >= 1.10.0
-Requires:       python3-stestr >= 2.0.0
+Requires:       python3-stestr
 Requires:       python3-testtools >= 2.2.0
 
 %description -n python3-oslotest

++++++ _service ++++++
--- /var/tmp/diff_new_pack.bagVlH/_old  2020-05-28 09:05:16.083329993 +0200
+++ /var/tmp/diff_new_pack.bagVlH/_new  2020-05-28 09:05:16.087330005 +0200
@@ -1,8 +1,8 @@
 <services>
   <service mode="disabled" name="renderspec">
-    <param 
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/oslotest/oslotest.spec.j2</param>
+    <param 
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslotest/oslotest.spec.j2</param>
     <param name="output-name">python-oslotest.spec</param>
-    <param 
name="requirements">https://raw.githubusercontent.com/openstack/oslotest/stable/train/requirements.txt</param>
+    <param 
name="requirements">https://opendev.org/openstack/oslotest/raw/branch/stable/ussuri/requirements.txt</param>
     <param name="changelog-email">[email protected]</param>
     <param name="changelog-provider">gh,openstack,oslotest</param>
   </service>

++++++ oslotest-3.8.1.tar.gz -> oslotest-4.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/.zuul.yaml 
new/oslotest-4.2.0/.zuul.yaml
--- old/oslotest-3.8.1/.zuul.yaml       2019-09-04 16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/.zuul.yaml       2020-04-03 22:31:16.000000000 +0200
@@ -3,8 +3,7 @@
       - check-requirements
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/AUTHORS new/oslotest-4.2.0/AUTHORS
--- old/oslotest-3.8.1/AUTHORS  2019-09-04 16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/AUTHORS  2020-04-03 22:32:24.000000000 +0200
@@ -20,6 +20,7 @@
 Flavio Percoco <[email protected]>
 George Peristerakis <[email protected]>
 Ghanshyam Mann <[email protected]>
+HervĂ© Beraud <[email protected]>
 Ian Wienand <[email protected]>
 Ihar Hrachyshka <[email protected]>
 Ilya Pekelny <[email protected]>
@@ -46,8 +47,10 @@
 Ronald Bradford <[email protected]>
 Sergey Kraynev <[email protected]>
 Soren Hansen <[email protected]>
+Stephen Finucane <[email protected]>
 Steve Martinelli <[email protected]>
 Thomas Bechtold <[email protected]>
+Thomas Goirand <[email protected]>
 Tony Breeds <[email protected]>
 Van Hung Pham <[email protected]>
 Victor Stinner <[email protected]>
@@ -64,5 +67,7 @@
 qingszhao <[email protected]>
 ricolin <[email protected]>
 venkatamahesh <[email protected]>
+wanghui <[email protected]>
 wangqi <[email protected]>
 yan.haifeng <[email protected]>
+zhangboye <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/ChangeLog new/oslotest-4.2.0/ChangeLog
--- old/oslotest-3.8.1/ChangeLog        2019-09-04 16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/ChangeLog        2020-04-03 22:32:24.000000000 +0200
@@ -1,6 +1,36 @@
 CHANGES
 =======
 
+4.2.0
+-----
+
+* Revert "Switch to unittest.mock from mock"
+
+4.1.0
+-----
+
+* Switch to unittest.mock from mock
+* Remove os-client-config and debtcollector
+
+4.0.0
+-----
+
+* Remove 'oslotest.functional'
+* Remove 'oslotest.moxstubout' module
+* remove outdated header
+* gitignore: Ignore reno artefacts
+* [ussuri][goal] Drop python 2.7 support and testing
+* trivial: Cleanup of doc config file
+* tox: Trivial cleanup
+* tools: Default to Python 3
+
+3.9.0
+-----
+
+* Invoke correct python version in shell scripts
+* Switch to Ussuri jobs
+* Update master for stable/train
+
 3.8.1
 -----
 
@@ -24,6 +54,7 @@
 * Update hacking version
 * Change openstack-dev to openstack-discuss
 * Title underline too long
+* Remove stestr from requirements.txt
 * Don't quote {posargs} in tox.ini
 * Fix nits in timeout change
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/PKG-INFO new/oslotest-4.2.0/PKG-INFO
--- old/oslotest-3.8.1/PKG-INFO 2019-09-04 16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/PKG-INFO 2020-04-03 22:32:25.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: oslotest
-Version: 3.8.1
+Version: 4.2.0
 Summary: Oslo test framework
 Home-page: https://docs.openstack.org/oslotest/latest/
 Author: OpenStack
@@ -36,8 +36,9 @@
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/doc/source/conf.py 
new/oslotest-4.2.0/doc/source/conf.py
--- old/oslotest-3.8.1/doc/source/conf.py       2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/doc/source/conf.py       2020-04-03 22:31:16.000000000 
+0200
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,34 +13,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('../..'))
-# -- General configuration ----------------------------------------------------
+# -- General configuration ---------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    #'sphinx.ext.intersphinx',
     'openstackdocstheme',
+    'sphinxcontrib.apidoc',
 ]
 
-# autodoc generation is a bit aggressive and a nuisance when doing heavy
-# text edit cycles.
-# execute "export SPHINX_DEBUG=1" in your terminal to disable
 modindex_common_prefix = ['oslotest.']
 
-# The suffix of source filenames.
-source_suffix = '.rst'
-
 # The master toctree document.
 master_doc = 'index'
 
 # General information about the project.
 project = u'oslotest'
-copyright = u'2014, OpenStack Foundation'
+copyright = u'2014-2019, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -51,37 +41,24 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# -- Options for HTML output --------------------------------------------------
+
+# -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-# html_theme_path = ["."]
-# html_static_path = ['static']
 html_theme = 'openstackdocs'
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
+# -- openstackdocstheme configuration ----------------------------------------
 
-# openstackdocstheme options
 repository_name = 'openstack/oslotest'
 bug_project = 'oslotest'
 bug_tag = ''
 
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass
-# [howto/manual]).
-latex_documents = [
-    ('index',
-     '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
-]
-
-# Example configuration for intersphinx: refer to the Python standard library.
-#intersphinx_mapping = {'http://docs.python.org/': None}
-
+# sphinxcontrib.apidoc options
+apidoc_module_dir = '../../oslotest'
+apidoc_output_dir = 'reference/api'
+apidoc_excluded_paths = [
+    'tests/*',
+    'tests']
+apidoc_separate_modules = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/doc/source/reference/index.rst 
new/oslotest-4.2.0/doc/source/reference/index.rst
--- old/oslotest-3.8.1/doc/source/reference/index.rst   2019-09-04 
16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/doc/source/reference/index.rst   2020-04-03 
22:31:16.000000000 +0200
@@ -6,4 +6,4 @@
 .. toctree::
    :maxdepth: 1
 
-   api/autoindex
\ No newline at end of file
+   api/modules.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/lower-constraints.txt 
new/oslotest-4.2.0/lower-constraints.txt
--- old/oslotest-3.8.1/lower-constraints.txt    2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/lower-constraints.txt    2020-04-03 22:31:16.000000000 
+0200
@@ -2,7 +2,6 @@
 appdirs==1.3.0
 Babel==2.3.4
 coverage==4.0
-debtcollector==1.2.0
 docutils==0.11
 dulwich==0.15.0
 extras==1.0.0
@@ -17,10 +16,8 @@
 MarkupSafe==1.0
 mccabe==0.2.1
 mock==2.0.0
-mox3==0.20.0
 netaddr==0.7.18
 openstackdocstheme==1.18.1
-os-client-config==1.28.0
 oslo.config==5.2.0
 oslo.i18n==3.15.3
 pbr==2.0.0
@@ -38,6 +35,7 @@
 six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
+sphinxcontrib-apidoc===0.2.0
 sphinxcontrib-websupport==1.0.1
 stestr==2.0.0
 stevedore==1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest/functional.py 
new/oslotest-4.2.0/oslotest/functional.py
--- old/oslotest-3.8.1/oslotest/functional.py   2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/oslotest/functional.py   1970-01-01 01:00:00.000000000 
+0100
@@ -1,65 +0,0 @@
-# Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from debtcollector import removals
-import os_client_config
-
-
-removals.removed_module("oslotest.functional",
-                        version="2.9.0", removal_version="3.0",
-                        message="oslotest.functional will be removed.")
-
-
-def _get_openstack_auth(openstack_config, cloud_name, override_name):
-    try:
-        cloud_config = openstack_config.get_one_cloud(cloud_name)
-    except os_client_config.exceptions.OpenStackConfigException:
-        try:
-            cloud_config = openstack_config.get_one_cloud(
-                'devstack', auth=dict(
-                    username=override_name, project_name=override_name))
-        except os_client_config.exceptions.OpenStackConfigException:
-            try:
-                cloud_config = openstack_config.get_one_cloud('envvars')
-            except os_client_config.exceptions.OpenStackConfigException:
-                cloud_config = None
-    return cloud_config
-
-
-class FunctionalAuth(object):
-
-    def __init__(self):
-        # Collecting of credentials:
-        #
-        # Grab the cloud config from a user's clouds.yaml file.
-        # First look for a functional_admin cloud, as this is a cloud
-        # that the user may have defined for functional testing that has
-        # admin credentials.
-        #
-        # If that is not found, get the devstack config and override the
-        # username and project_name to be admin so that admin credentials
-        # will be used.
-        #
-        # Finally, fall back to looking for environment variables to support
-        # existing users running these the old way.
-        openstack_config = os_client_config.config.OpenStackConfig()
-        self._cloud_config = {}
-        self._cloud_config['admin'] = _get_openstack_auth(
-            openstack_config, 'functional_admin', 'admin')
-        self._cloud_config['user'] = _get_openstack_auth(
-            openstack_config, 'functional_user', 'demo')
-
-    def get_auth_info(self, name):
-        return self._cloud_config[name].config['auth']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest/moxstubout.py 
new/oslotest-4.2.0/oslotest/moxstubout.py
--- old/oslotest-3.8.1/oslotest/moxstubout.py   2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/oslotest/moxstubout.py   1970-01-01 01:00:00.000000000 
+0100
@@ -1,34 +0,0 @@
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# Copyright 2013 Hewlett-Packard Development Company, L.P.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from debtcollector import removals
-import fixtures
-from mox3 import mox
-
-
[email protected]_class('MoxStubout', version='3.5.0')
-class MoxStubout(fixtures.Fixture):
-    """Deal with code around mox and stubout as a fixture."""
-
-    def setUp(self):
-        super(MoxStubout, self).setUp()
-        # emulate some of the mox stuff, we can't use the metaclass
-        # because it screws with our generators
-        self.mox = mox.Mox()
-        self.stubs = self.mox.stubs
-        self.addCleanup(self.mox.UnsetStubs)
-        self.addCleanup(self.mox.VerifyAll)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslotest-3.8.1/oslotest/tests/unit/test_moxstubout.py 
new/oslotest-4.2.0/oslotest/tests/unit/test_moxstubout.py
--- old/oslotest-3.8.1/oslotest/tests/unit/test_moxstubout.py   2019-09-04 
16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/oslotest/tests/unit/test_moxstubout.py   1970-01-01 
01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslotest import base
-from oslotest import moxstubout
-
-
-class TestMoxStubout(base.BaseTestCase):
-
-    def _stubable(self):
-        pass
-
-    def test_basic_stubout(self):
-        f = self.useFixture(moxstubout.MoxStubout())
-        before = TestMoxStubout._stubable
-        f.mox.StubOutWithMock(TestMoxStubout, '_stubable')
-        after = TestMoxStubout._stubable
-        self.assertNotEqual(before, after)
-        f.cleanUp()
-        after2 = TestMoxStubout._stubable
-        self.assertEqual(before, after2)
-        f._clear_cleanups()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest.egg-info/PKG-INFO 
new/oslotest-4.2.0/oslotest.egg-info/PKG-INFO
--- old/oslotest-3.8.1/oslotest.egg-info/PKG-INFO       2019-09-04 
16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/oslotest.egg-info/PKG-INFO       2020-04-03 
22:32:25.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: oslotest
-Version: 3.8.1
+Version: 4.2.0
 Summary: Oslo test framework
 Home-page: https://docs.openstack.org/oslotest/latest/
 Author: OpenStack
@@ -36,8 +36,9 @@
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest.egg-info/SOURCES.txt 
new/oslotest-4.2.0/oslotest.egg-info/SOURCES.txt
--- old/oslotest-3.8.1/oslotest.egg-info/SOURCES.txt    2019-09-04 
16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/oslotest.egg-info/SOURCES.txt    2020-04-03 
22:32:25.000000000 +0200
@@ -30,11 +30,9 @@
 oslotest/__init__.py
 oslotest/base.py
 oslotest/createfile.py
-oslotest/functional.py
 oslotest/log.py
 oslotest/mock_fixture.py
 oslotest/modules.py
-oslotest/moxstubout.py
 oslotest/output.py
 oslotest/timeout.py
 oslotest.egg-info/PKG-INFO
@@ -52,7 +50,6 @@
 oslotest/tests/unit/test_mock_fixture.py
 oslotest/tests/unit/test_mockpatch.py
 oslotest/tests/unit/test_modules.py
-oslotest/tests/unit/test_moxstubout.py
 oslotest/tests/unit/test_output.py
 oslotest/tests/unit/test_timeout.py
 oslotest/tools/__init__.py
@@ -60,7 +57,10 @@
 releasenotes/notes/add-reno-996dd44974d53238.yaml
 releasenotes/notes/controlling-output-capture-e47c66bbca4a694a.yaml
 releasenotes/notes/deprecate-functional-module-fbed600d2fa026fc.yaml
+releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml
 releasenotes/notes/mock-autospec-fix-9042c30dbb74032f.yaml
+releasenotes/notes/remove-functional-module-4733bc6eff595683.yaml
+releasenotes/notes/remove-moxstubout-63345dd5d9528e83.yaml
 releasenotes/notes/remove_mockpatch-80fec29f28da5d5c.yaml
 releasenotes/notes/timeout-scaling-52741beadde528e5.yaml
 releasenotes/source/conf.py
@@ -70,6 +70,7 @@
 releasenotes/source/queens.rst
 releasenotes/source/rocky.rst
 releasenotes/source/stein.rst
+releasenotes/source/train.rst
 releasenotes/source/unreleased.rst
 releasenotes/source/_static/.placeholder
 releasenotes/source/_templates/.placeholder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest.egg-info/pbr.json 
new/oslotest-4.2.0/oslotest.egg-info/pbr.json
--- old/oslotest-3.8.1/oslotest.egg-info/pbr.json       2019-09-04 
16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/oslotest.egg-info/pbr.json       2020-04-03 
22:32:25.000000000 +0200
@@ -1 +1 @@
-{"git_version": "7ad16de", "is_release": true}
\ No newline at end of file
+{"git_version": "cdee551", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/oslotest.egg-info/requires.txt 
new/oslotest-4.2.0/oslotest.egg-info/requires.txt
--- old/oslotest-3.8.1/oslotest.egg-info/requires.txt   2019-09-04 
16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/oslotest.egg-info/requires.txt   2020-04-03 
22:32:25.000000000 +0200
@@ -1,9 +1,5 @@
 fixtures>=3.0.0
 python-subunit>=1.0.0
 six>=1.10.0
-stestr>=2.0.0
 testtools>=2.2.0
 mock>=2.0.0
-mox3>=0.20.0
-os-client-config>=1.28.0
-debtcollector>=1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslotest-3.8.1/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml 
new/oslotest-4.2.0/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml
--- old/oslotest-3.8.1/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml 
1970-01-01 01:00:00.000000000 +0100
+++ new/oslotest-4.2.0/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml 
2020-04-03 22:31:16.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. The minimum version of Python now
+    supported by oslotest is Python 3.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslotest-3.8.1/releasenotes/notes/remove-functional-module-4733bc6eff595683.yaml
 
new/oslotest-4.2.0/releasenotes/notes/remove-functional-module-4733bc6eff595683.yaml
--- 
old/oslotest-3.8.1/releasenotes/notes/remove-functional-module-4733bc6eff595683.yaml
        1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslotest-4.2.0/releasenotes/notes/remove-functional-module-4733bc6eff595683.yaml
        2020-04-03 22:31:16.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``oslotest.functional`` module, which was deprecated in 2.18.1, has
+    now been removed. This module was overly complicated and had no users.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslotest-3.8.1/releasenotes/notes/remove-moxstubout-63345dd5d9528e83.yaml 
new/oslotest-4.2.0/releasenotes/notes/remove-moxstubout-63345dd5d9528e83.yaml
--- 
old/oslotest-3.8.1/releasenotes/notes/remove-moxstubout-63345dd5d9528e83.yaml   
    1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslotest-4.2.0/releasenotes/notes/remove-moxstubout-63345dd5d9528e83.yaml   
    2020-04-03 22:31:16.000000000 +0200
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The ``oslotest.moxstubout`` module, which was deprecated in 3.5.0, has now
+    been removed. Mox is considered unmaintained and should be replaced by
+    mock.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/releasenotes/source/conf.py 
new/oslotest-4.2.0/releasenotes/source/conf.py
--- old/oslotest-3.8.1/releasenotes/source/conf.py      2019-09-04 
16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/releasenotes/source/conf.py      2020-04-03 
22:31:16.000000000 +0200
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,25 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
-
 # -- General configuration ------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
@@ -39,15 +23,6 @@
     'reno.sphinxext',
 ]
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-# source_encoding = 'utf-8-sig'
-
 # The master toctree document.
 master_doc = 'index'
 
@@ -62,44 +37,9 @@
 # The short X.Y version.
 version = ''
 
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-# language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-# today = ''
-# Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-# default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-# add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-# show_authors = False
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-# keep_warnings = False
-
 
 # -- Options for HTML output ----------------------------------------------
 
@@ -107,171 +47,14 @@
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-# html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-# html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-# html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-# html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-# html_extra_path = []
-
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 # html_last_updated_fmt = '%b %d, %Y'
 html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-# html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-# html_additional_pages = {}
-
-# If false, no module index is generated.
-# html_domain_indices = True
-
-# If false, no index is generated.
-# html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-# html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-# html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'oslotestReleaseNotesDoc'
+# -- openstackdocstheme configuration -------------------------------------
 
-# openstackdocstheme options
 repository_name = 'openstack/oslotest'
 bug_project = 'oslotest'
 bug_tag = ''
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    ('index', 'oslotestReleaseNotes.tex',
-     u'oslotest Release Notes Documentation',
-     u'oslotest Developers', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-# latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-# latex_use_parts = False
-
-# If true, show page references after internal links.
-# latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-# latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-# latex_appendices = []
-
-# If false, no module index is generated.
-# latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'oslotestReleaseNotes',
-     u'oslotest Release Notes Documentation',
-     [u'oslotest Developers'], 1)
-]
-
-# If true, show URL addresses after external links.
-# man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    ('index', 'oslotestReleaseNotes',
-     u'oslotest Release Notes Documentation',
-     u'oslotest Developers', 'oslotestReleaseNotes',
-     'One line description of project.',
-     'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
-
-# If false, no module index is generated.
-# texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-# texinfo_no_detailmenu = False
-
-# -- Options for Internationalization output ------------------------------
-locale_dirs = ['locale/']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/releasenotes/source/index.rst 
new/oslotest-4.2.0/releasenotes/source/index.rst
--- old/oslotest-3.8.1/releasenotes/source/index.rst    2019-09-04 
16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/releasenotes/source/index.rst    2020-04-03 
22:31:16.000000000 +0200
@@ -6,6 +6,7 @@
     :maxdepth: 1
 
     unreleased
+    train
     stein
     rocky
     queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/releasenotes/source/train.rst 
new/oslotest-4.2.0/releasenotes/source/train.rst
--- old/oslotest-3.8.1/releasenotes/source/train.rst    1970-01-01 
01:00:00.000000000 +0100
+++ new/oslotest-4.2.0/releasenotes/source/train.rst    2020-04-03 
22:31:16.000000000 +0200
@@ -0,0 +1,6 @@
+==========================
+Train Series Release Notes
+==========================
+
+.. release-notes::
+   :branch: stable/train
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/requirements.txt 
new/oslotest-4.2.0/requirements.txt
--- old/oslotest-3.8.1/requirements.txt 2019-09-04 16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/requirements.txt 2020-04-03 22:31:16.000000000 +0200
@@ -5,9 +5,5 @@
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 six>=1.10.0 # MIT
-stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 mock>=2.0.0 # BSD
-mox3>=0.20.0 # Apache-2.0
-os-client-config>=1.28.0 # Apache-2.0
-debtcollector>=1.2.0  # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/setup.cfg new/oslotest-4.2.0/setup.cfg
--- old/oslotest-3.8.1/setup.cfg        2019-09-04 16:26:13.000000000 +0200
+++ new/oslotest-4.2.0/setup.cfg        2020-04-03 22:32:25.000000000 +0200
@@ -6,6 +6,7 @@
 author = OpenStack
 author-email = [email protected]
 home-page = https://docs.openstack.org/oslotest/latest/
+python-requires = >=3.6
 classifier = 
        Environment :: OpenStack
        Intended Audience :: Developers
@@ -13,11 +14,11 @@
        License :: OSI Approved :: Apache Software License
        Operating System :: POSIX :: Linux
        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 :: Only
+       Programming Language :: Python :: Implementation :: CPython
 
 [files]
 packages = 
@@ -27,24 +28,6 @@
        tools/oslo_run_cross_tests
        tools/oslo_run_pre_release_tests
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
-[pbr]
-autodoc_index_modules = true
-api_doc_dir = reference/api
-autodoc_exclude_modules = 
-       oslotest.tests.*
-
-[wheel]
-universal = true
-
 [egg_info]
 tag_build = 
 tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/setup.py new/oslotest-4.2.0/setup.py
--- old/oslotest-3.8.1/setup.py 2019-09-04 16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/setup.py 2020-04-03 22:31:16.000000000 +0200
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 # In python < 2.7.4, a lazy loading of package `pbr` will break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/test-requirements.txt 
new/oslotest-4.2.0/test-requirements.txt
--- old/oslotest-3.8.1/test-requirements.txt    2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/test-requirements.txt    2020-04-03 22:31:16.000000000 
+0200
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=2.0.0,<2.1.0 # Apache-2.0
 
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
@@ -10,9 +10,9 @@
 coverage!=4.4,>=4.0 # Apache-2.0
 
 # this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5  # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
+sphinxcontrib-apidoc>=0.2.0  # BSD
 oslo.config>=5.2.0 # Apache-2.0
 stestr>=2.0.0
 reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/tools/oslo_debug_helper 
new/oslotest-4.2.0/tools/oslo_debug_helper
--- old/oslotest-3.8.1/tools/oslo_debug_helper  2019-09-04 16:25:27.000000000 
+0200
+++ new/oslotest-4.2.0/tools/oslo_debug_helper  2020-04-03 22:31:16.000000000 
+0200
@@ -10,6 +10,8 @@
 # relative to the project directory. If no value is passed, it is assumed
 # to be packagename/tests.
 
+PYTHON=${PYTHON:-python3}
+
 TMP_DIR=`mktemp -d debug-$$-XXX` || exit 1
 trap "rm -rf $TMP_DIR" EXIT
 
@@ -17,7 +19,7 @@
 TESTS_TO_RUN=$TMP_DIR/tests_to_run
 
 # Default to packagename/tests, i.e., keystone/tests
-PACKAGENAME=$(python setup.py --name)
+PACKAGENAME=$(${PYTHON} setup.py --name)
 TEST_DIR=./$PACKAGENAME/tests
 
 # If a specific path is passed, use that one
@@ -27,7 +29,7 @@
     esac
 done
 
-python -m testtools.run discover -t ./ $TEST_DIR --list > $ALL_TESTS
+${PYTHON} -m testtools.run discover -t ./ $TEST_DIR --list > $ALL_TESTS
 
 # getopts friendly way of determining if a positional arg has been passed
 ARG1=${@:$OPTIND:1}
@@ -37,4 +39,4 @@
     mv $ALL_TESTS $TESTS_TO_RUN
 fi
 
-python -m testtools.run discover --load-list $TESTS_TO_RUN
+${PYTHON} -m testtools.run discover --load-list $TESTS_TO_RUN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/tools/oslo_run_cross_tests 
new/oslotest-4.2.0/tools/oslo_run_cross_tests
--- old/oslotest-3.8.1/tools/oslo_run_cross_tests       2019-09-04 
16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/tools/oslo_run_cross_tests       2020-04-03 
22:31:16.000000000 +0200
@@ -9,6 +9,8 @@
 # Fail the build if any command fails
 set -e
 
+PYTHON=${PYTHON:-python3}
+
 function usage {
     cat - <<EOF
 ERROR: Missing argument(s)
@@ -46,13 +48,13 @@
 
 tox_envbin=$project_dir/.tox/$venv/bin
 
-our_name=$(python setup.py --name)
+our_name=$(${PYTHON} setup.py --name)
 
 # Build the egg-info, including the source file list,
 # so we install all of the files, even if the package
 # list or name has changed.
-rm -rf $(python setup.py --name).egg-info
-python setup.py egg_info
+rm -rf $(${PYTHON} setup.py --name).egg-info
+${PYTHON} setup.py egg_info
 
 # Replace the pip-installed package with the version in our source
 # tree. Look to see if we are already installed before trying to
@@ -92,8 +94,6 @@
     gzip -9 ./subunit_log.txt
     gzip -9 ./testr_results.html
 
-    export PYTHON=.tox/$venv/bin/python
-    set -e
     rancount=$(.tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests 
in.*/\1/p')
     if [ "$rancount" -eq "0" ] ; then
         echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslotest-3.8.1/tox.ini new/oslotest-4.2.0/tox.ini
--- old/oslotest-3.8.1/tox.ini  2019-09-04 16:25:27.000000000 +0200
+++ new/oslotest-4.2.0/tox.ini  2020-04-03 22:31:16.000000000 +0200
@@ -1,56 +1,49 @@
 [tox]
-minversion = 2.0
-distribute = False
-envlist = py27,py37,pep8
+minversion = 3.1.0
+envlist = py37,pep8
+ignore_basepython_conflict = True
 
 [testenv]
-install_command = pip install {opts} {packages}
+basepython = python3
 deps =
-  
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py27]
-basepython = python2.7
-
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:cover]
-basepython = python3
 setenv =
-    PYTHON=coverage run --source oslotest --parallel-mode
+  PYTHON=coverage run --source oslotest --parallel-mode
 commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
-commands = python setup.py build_sphinx
-
-[flake8]
-show-source = True
-exclude = .tox,dist,doc,*.egg,build
+commands =
+  sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source 
doc/build/html
 
-[hacking]
-import_exceptions =
-    six.moves.mock
 
 [testenv:releasenotes]
-basepython = python3
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html 
releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
+
+[flake8]
+show-source = true
+exclude = .tox,dist,doc,*.egg,build
+
+[hacking]
+import_exceptions =
+  six.moves.mock


Reply via email to