diff -Nru pytest-helpers-namespace-2017.11.11/debian/changelog pytest-helpers-namespace-2019.1.8/debian/changelog --- pytest-helpers-namespace-2017.11.11/debian/changelog 2017-11-11 17:11:25.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/debian/changelog 2019-07-14 15:54:04.000000000 +0000 @@ -1,3 +1,17 @@ +pytest-helpers-namespace (2019.1.8-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + * d/copyright: Use https protocol in Format field + * d/control: Remove ancient X-Python3-Version field + * Convert git repository from git-dpm to gbp layout + + [ Sean Whitton ] + * New upstream release. + * Update upstream copyright years in d/copyright. + + -- Sean Whitton Sun, 14 Jul 2019 16:54:04 +0100 + pytest-helpers-namespace (2017.11.11-1) unstable; urgency=medium * New upstream release. diff -Nru pytest-helpers-namespace-2017.11.11/debian/control pytest-helpers-namespace-2019.1.8/debian/control --- pytest-helpers-namespace-2017.11.11/debian/control 2017-11-11 17:11:05.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/debian/control 2019-07-14 15:54:04.000000000 +0000 @@ -11,9 +11,8 @@ python3-setuptools, Standards-Version: 4.1.1 Homepage: https://github.com/saltstack/pytest-helpers-namespace -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pytest-helpers-namespace.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pytest-helpers-namespace.git -X-Python3-Version: >= 3.3 +Vcs-Git: https://salsa.debian.org/python-team/modules/pytest-helpers-namespace.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/pytest-helpers-namespace Package: python3-pytest-helpers-namespace Architecture: all diff -Nru pytest-helpers-namespace-2017.11.11/debian/copyright pytest-helpers-namespace-2019.1.8/debian/copyright --- pytest-helpers-namespace-2017.11.11/debian/copyright 2017-11-11 16:57:22.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/debian/copyright 2019-07-14 15:54:04.000000000 +0000 @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pytest-helpers-namespace Source: https://pypi.python.org/pypi/pytest-helpers-namespace Files: * -Copyright: (C) 2016 the SaltStack Team +Copyright: (C) 2016-2019 the SaltStack Team License: Apache-2.0 Comment: This plugin was written by Pedro Algarvio diff -Nru pytest-helpers-namespace-2017.11.11/debian/.git-dpm pytest-helpers-namespace-2019.1.8/debian/.git-dpm --- pytest-helpers-namespace-2017.11.11/debian/.git-dpm 2017-11-11 16:57:22.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# see git-dpm(1) from git-dpm package -30a004ac7fcd4db3f8abe6e825bb64d6ec67c179 -30a004ac7fcd4db3f8abe6e825bb64d6ec67c179 -30a004ac7fcd4db3f8abe6e825bb64d6ec67c179 -30a004ac7fcd4db3f8abe6e825bb64d6ec67c179 -pytest-helpers-namespace_2017.11.11.orig.tar.gz -992046342447ed8ad264183194218cffc3ac8236 -5021 diff -Nru pytest-helpers-namespace-2017.11.11/PKG-INFO pytest-helpers-namespace-2019.1.8/PKG-INFO --- pytest-helpers-namespace-2017.11.11/PKG-INFO 2017-11-10 19:27:19.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/PKG-INFO 2019-01-07 17:57:08.000000000 +0000 @@ -1,10 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: pytest-helpers-namespace -Version: 2017.11.11 +Version: 2019.1.8 Summary: PyTest Helpers Namespace Home-page: https://github.com/saltstack/pytest-helpers-namespace Author: Pedro Algarvio Author-email: pedro@algarvio.me +Maintainer: Pedro Algarvio +Maintainer-email: pedro@algarvio.me License: Apache Software License 2.0 Description: Pytest Helpers Namespace ======================== @@ -148,6 +150,27 @@ Changelog --------- + + v2019.1.8 + ~~~~~~~~~ + + * Patch PyTest before any ``conftest.py`` file is processed. + + v2019.1.7 + ~~~~~~~~~ + + * Support PyTest >= 4.1 + + v2019.1.6.post1 + ~~~~~~~~~~~~~~~ + + * No changes were made besides locking to PyTest < 4.0 + + v2019.1.6 + ~~~~~~~~~ + + * No changes were made besides locking to PyTest < 4.1 + v2017.11.11 ~~~~~~~~~~~ @@ -209,9 +232,9 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Operating System :: OS Independent diff -Nru pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace/plugin.py pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace/plugin.py --- pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace/plugin.py 2017-11-10 19:20:27.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace/plugin.py 2019-01-07 17:52:39.000000000 +0000 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` - :copyright: © 2016-2017 by the SaltStack Team, see AUTHORS for more details. + :copyright: © 2016-2019 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. @@ -14,6 +14,9 @@ # Import python libs from functools import partial, wraps +# Import 3rd-party libs +import pytest + class FuncWrapper(object): @@ -86,8 +89,28 @@ ) -def pytest_namespace(): - ''' - Register our own namespace with pytest - ''' - return {'helpers': HelpersRegistry()} +if tuple([int(part) for part in pytest.__version__.split('.') if part.isdigit()]) < (4, 1): + # PyTest < 4.1 + def pytest_namespace(): + ''' + Register our own namespace with pytest + ''' + return {'helpers': HelpersRegistry()} +else: + # PyTest >= 4.1 + # This now uses the stop gap provided in: + # https://docs.pytest.org/en/latest/deprecations.html#pytest-namespace + # + # We however use `pytest_load_initial_conftests` because we need to "patch" + # pytest before any conftest is loaded. + def pytest_load_initial_conftests(early_config, parser, args): + try: + pytest.helpers + except AttributeError: + pytest.helpers = HelpersRegistry() + + def pytest_unconfigure(): + try: + delattr(pytest, 'helpers') + except AttributeError: + pass diff -Nru pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace/version.py pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace/version.py --- pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace/version.py 2017-11-10 19:25:30.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace/version.py 2019-01-07 17:54:02.000000000 +0000 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` - :copyright: © 2016-2017 by the SaltStack Team, see AUTHORS for more details. + :copyright: © 2016-2019 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. @@ -16,5 +16,5 @@ from __future__ import absolute_import -__version_info__ = (2017, 11, 11) +__version_info__ = (2019, 1, 8) __version__ = '{0}.{1}.{2}'.format(*__version_info__) diff -Nru pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace.egg-info/PKG-INFO pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace.egg-info/PKG-INFO --- pytest-helpers-namespace-2017.11.11/pytest_helpers_namespace.egg-info/PKG-INFO 2017-11-10 19:27:18.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/pytest_helpers_namespace.egg-info/PKG-INFO 2019-01-07 17:57:08.000000000 +0000 @@ -1,10 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: pytest-helpers-namespace -Version: 2017.11.11 +Version: 2019.1.8 Summary: PyTest Helpers Namespace Home-page: https://github.com/saltstack/pytest-helpers-namespace Author: Pedro Algarvio Author-email: pedro@algarvio.me +Maintainer: Pedro Algarvio +Maintainer-email: pedro@algarvio.me License: Apache Software License 2.0 Description: Pytest Helpers Namespace ======================== @@ -148,6 +150,27 @@ Changelog --------- + + v2019.1.8 + ~~~~~~~~~ + + * Patch PyTest before any ``conftest.py`` file is processed. + + v2019.1.7 + ~~~~~~~~~ + + * Support PyTest >= 4.1 + + v2019.1.6.post1 + ~~~~~~~~~~~~~~~ + + * No changes were made besides locking to PyTest < 4.0 + + v2019.1.6 + ~~~~~~~~~ + + * No changes were made besides locking to PyTest < 4.1 + v2017.11.11 ~~~~~~~~~~~ @@ -209,9 +232,9 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Operating System :: OS Independent diff -Nru pytest-helpers-namespace-2017.11.11/README.rst pytest-helpers-namespace-2019.1.8/README.rst --- pytest-helpers-namespace-2017.11.11/README.rst 2017-11-10 19:26:28.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/README.rst 2019-01-07 17:53:52.000000000 +0000 @@ -140,6 +140,27 @@ Changelog --------- + +v2019.1.8 +~~~~~~~~~ + +* Patch PyTest before any ``conftest.py`` file is processed. + +v2019.1.7 +~~~~~~~~~ + +* Support PyTest >= 4.1 + +v2019.1.6.post1 +~~~~~~~~~~~~~~~ + +* No changes were made besides locking to PyTest < 4.0 + +v2019.1.6 +~~~~~~~~~ + +* No changes were made besides locking to PyTest < 4.1 + v2017.11.11 ~~~~~~~~~~~ diff -Nru pytest-helpers-namespace-2017.11.11/setup.cfg pytest-helpers-namespace-2019.1.8/setup.cfg --- pytest-helpers-namespace-2017.11.11/setup.cfg 2017-11-10 19:27:19.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/setup.cfg 2019-01-07 17:57:08.000000000 +0000 @@ -11,5 +11,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -Nru pytest-helpers-namespace-2017.11.11/setup.py pytest-helpers-namespace-2019.1.8/setup.py --- pytest-helpers-namespace-2017.11.11/setup.py 2016-07-10 10:59:25.000000000 +0000 +++ pytest-helpers-namespace-2019.1.8/setup.py 2019-01-07 17:39:50.000000000 +0000 @@ -45,10 +45,6 @@ VERSION = _LOCALS['__version__'] LONG_DESCRIPTION = read('README.rst') -def read(fname): - file_path = os.path.join(os.path.dirname(__file__), fname) - return codecs.open(file_path, encoding='utf-8').read() - setup( name='pytest-helpers-namespace', @@ -72,9 +68,9 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Operating System :: OS Independent',