Hello community, here is the log from the commit of package python-pytest-relaxed for openSUSE:Factory checked in at 2019-07-30 12:59:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-relaxed (Old) and /work/SRC/openSUSE:Factory/.python-pytest-relaxed.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pytest-relaxed" Tue Jul 30 12:59:49 2019 rev:3 rq:710328 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-relaxed/python-pytest-relaxed.changes 2019-03-26 15:37:05.972380190 +0100 +++ /work/SRC/openSUSE:Factory/.python-pytest-relaxed.new.4126/python-pytest-relaxed.changes 2019-07-30 12:59:50.774455391 +0200 @@ -1,0 +2,6 @@ +Mon Jun 17 10:49:38 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> + +- Update to 1.1.5: + * Fix compatibility with pytest versions 3.3 and above. + +------------------------------------------------------------------- Old: ---- pytest-relaxed-1.1.4.tar.gz New: ---- pytest-relaxed-1.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-relaxed.spec ++++++ --- /var/tmp/diff_new_pack.ZDc9Go/_old 2019-07-30 12:59:51.250455285 +0200 +++ /var/tmp/diff_new_pack.ZDc9Go/_new 2019-07-30 12:59:51.250455285 +0200 @@ -18,13 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-relaxed -Version: 1.1.4 +Version: 1.1.5 Release: 0 Summary: Relaxed test discovery/organization for pytest License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/bitprophet/pytest-relaxed -Source: https://files.pythonhosted.org/packages/source/p/pytest_relaxed/pytest-relaxed-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pytest-relaxed/pytest-relaxed-%{version}.tar.gz BuildRequires: %{python_module decorator >= 4} BuildRequires: %{python_module pytest >= 3} BuildRequires: %{python_module setuptools} @@ -56,8 +56,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# https://github.com/bitprophet/pytest-relaxed/issues/2 -#%%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v +%pytest %files %{python_files} %license LICENSE ++++++ pytest-relaxed-1.1.4.tar.gz -> pytest-relaxed-1.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/LICENSE new/pytest-relaxed-1.1.5/LICENSE --- old/pytest-relaxed-1.1.4/LICENSE 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/LICENSE 2019-06-14 20:05:29.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2018 Jeff Forcier. +Copyright (c) 2019 Jeff Forcier. All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/PKG-INFO new/pytest-relaxed-1.1.5/PKG-INFO --- old/pytest-relaxed-1.1.4/PKG-INFO 2018-07-25 03:04:03.000000000 +0200 +++ new/pytest-relaxed-1.1.5/PKG-INFO 2019-06-14 20:16:01.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytest-relaxed -Version: 1.1.4 +Version: 1.1.5 Summary: Relaxed test discovery/organization for pytest Home-page: https://pytest-relaxed.readthedocs.io/ Author: Jeff Forcier @@ -272,5 +272,6 @@ 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 Classifier: Topic :: Software Development :: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/dev-requirements.txt new/pytest-relaxed-1.1.5/dev-requirements.txt --- old/pytest-relaxed-1.1.4/dev-requirements.txt 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/dev-requirements.txt 2019-06-14 20:05:29.000000000 +0200 @@ -3,7 +3,7 @@ # # Linting -flake8>=2.4,<3 +flake8==3.6 # Packaging twine==1.11.0 # Test coverage @@ -21,10 +21,6 @@ # TODO: use pip-tools or similar? # -# flake8 -mccabe==0.6.1 -pycodestyle==2.3.1 -pyflakes==1.5.0 # twine args==0.1.0 certifi==2018.4.16 @@ -32,16 +28,16 @@ clint==0.5.1 idna==2.6 pkginfo==1.4.2 -requests==2.18.4 +requests==2.20.0 requests-toolbelt==0.8.0 -urllib3==1.22 +urllib3==1.24.2 # invocations alabaster==0.7.10 babel==2.4.0 blessings==1.6 docutils==0.13.1 imagesize==0.7.1 -Jinja2==2.9.6 +Jinja2==2.10.1 MarkupSafe==1.0 Pygments==2.2.0 pytz==2017.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/docs/changelog.rst new/pytest-relaxed-1.1.5/docs/changelog.rst --- old/pytest-relaxed-1.1.4/docs/changelog.rst 2018-07-25 03:03:57.000000000 +0200 +++ new/pytest-relaxed-1.1.5/docs/changelog.rst 2019-06-14 20:15:25.000000000 +0200 @@ -2,6 +2,8 @@ Changelog ========= +- :release:`1.1.5 <2019-06-14>` +- :bug:`2` Fix compatibility with pytest versions 3.3 and above. - :release:`1.1.4 <2018-07-24>` - :release:`1.0.2 <2018-07-24>` - :support:`- backported` Add missing universal wheel indicator in setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed/_version.py new/pytest-relaxed-1.1.5/pytest_relaxed/_version.py --- old/pytest-relaxed-1.1.4/pytest_relaxed/_version.py 2018-07-25 03:04:01.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed/_version.py 2019-06-14 20:05:29.000000000 +0200 @@ -1,2 +1,2 @@ -__version_info__ = (1, 1, 4) +__version_info__ = (1, 1, 5) __version__ = ".".join(map(str, __version_info__)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed/classes.py new/pytest-relaxed-1.1.5/pytest_relaxed/classes.py --- old/pytest-relaxed-1.1.4/pytest_relaxed/classes.py 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed/classes.py 2019-06-14 20:05:29.000000000 +0200 @@ -28,6 +28,7 @@ """ A mixin applying collection rules to both modules and inner/nested classes. """ + # TODO: # - worth calling super() in these? Difficult to know what to do with it; # it would say "no" to lots of stuff we want to say "yes" to. @@ -153,14 +154,20 @@ setattr(obj, name, value) return obj - def makeitem(self, name, obj): + # Stub for pytest >=3.0,<3.3 where _makeitem did not exist + def makeitem(self, *args, **kwargs): + return self._makeitem(*args, **kwargs) + + def _makeitem(self, name, obj): # More pytestmark skipping. if name == "pytestmark": return # NOTE: no need to modify collect() this time, just mutate item - # creation. - # TODO: can't we redo SpecClass the same way? And SpecModule?? - item = super(SpecInstance, self).makeitem(name, obj) + # creation. TODO: but if collect() is still public, let's move to that + # sometime, if that'll work as well. + superb = super(SpecInstance, self) + attr = "_makeitem" if hasattr(superb, "_makeitem") else "makeitem" + item = getattr(superb, attr)(name, obj) # Replace any Class objects with SpecClass; this will automatically # recurse. # TODO: can we unify this with SpecModule's same bits? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed/plugin.py new/pytest-relaxed-1.1.5/pytest_relaxed/plugin.py --- old/pytest-relaxed-1.1.4/pytest_relaxed/plugin.py 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed/plugin.py 2019-06-14 20:05:29.000000000 +0200 @@ -21,11 +21,10 @@ if ( path.ext == ".py" and path.basename != "conftest.py" - and # Also skip anything prefixed with test_; pytest's own native # collection will get that stuff, and we don't _want_ to try modifying # such files anyways. - not path.basename.startswith("test_") + and not path.basename.startswith("test_") ): # Then use our custom module class which performs modified # function/class selection as well as class recursion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed/reporter.py new/pytest-relaxed-1.1.5/pytest_relaxed/reporter.py --- old/pytest-relaxed-1.1.4/pytest_relaxed/reporter.py 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed/reporter.py 2019-06-14 20:05:29.000000000 +0200 @@ -75,8 +75,9 @@ self.display_result(report) def update_stats(self, report): - status_getter = self.config.hook.pytest_report_teststatus - cat, letter, word = status_getter(report=report) + cat, letter, word = self.config.hook.pytest_report_teststatus( + report=report, config=self.config + ) self.stats.setdefault(cat, []).append(report) # For use later; apparently some other plugins can yield display markup # in the 'word' field of a report. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed/trap.py new/pytest-relaxed-1.1.5/pytest_relaxed/trap.py --- old/pytest-relaxed-1.1.4/pytest_relaxed/trap.py 2018-07-25 02:03:25.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed/trap.py 2019-06-14 20:05:29.000000000 +0200 @@ -20,6 +20,7 @@ """ An IO wrapper capable of multiplexing its writes to other buffer objects. """ + # NOTE: because StringIO.StringIO on Python 2 is an old-style class we # cannot use super() :( def __init__(self, buffer=b"", cc=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed.egg-info/PKG-INFO new/pytest-relaxed-1.1.5/pytest_relaxed.egg-info/PKG-INFO --- old/pytest-relaxed-1.1.4/pytest_relaxed.egg-info/PKG-INFO 2018-07-25 03:04:03.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed.egg-info/PKG-INFO 2019-06-14 20:16:01.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytest-relaxed -Version: 1.1.4 +Version: 1.1.5 Summary: Relaxed test discovery/organization for pytest Home-page: https://pytest-relaxed.readthedocs.io/ Author: Jeff Forcier @@ -272,5 +272,6 @@ 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 Classifier: Topic :: Software Development :: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/pytest_relaxed.egg-info/requires.txt new/pytest-relaxed-1.1.5/pytest_relaxed.egg-info/requires.txt --- old/pytest-relaxed-1.1.4/pytest_relaxed.egg-info/requires.txt 2018-07-25 03:04:03.000000000 +0200 +++ new/pytest-relaxed-1.1.5/pytest_relaxed.egg-info/requires.txt 2019-06-14 20:16:01.000000000 +0200 @@ -1,3 +1,3 @@ -pytest<3.3,>=3 +pytest<5,>=3 six<2,>=1 decorator<5,>=4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/setup.py new/pytest-relaxed-1.1.5/setup.py --- old/pytest-relaxed-1.1.4/setup.py 2018-07-25 02:03:25.000000000 +0200 +++ new/pytest-relaxed-1.1.5/setup.py 2019-06-14 20:05:29.000000000 +0200 @@ -24,16 +24,7 @@ # TODO: do we need to name the LHS 'pytest_relaxed' too? meh "pytest11": ["relaxed = pytest_relaxed.plugin"] }, - install_requires=[ - # NOTE: pytest 3.3 broke something, not sure what yet - "pytest>=3,<3.3", - # TODO: ditto; six is so widely used it's prob worth having a broad pin - "six>=1,<2", - # TODO: ditto again! - # TODO: but also, we could make this optional if it somehow ever caused - # issues for anyone. Only necessary for @raises right now. - "decorator>=4,<5", - ], + install_requires=["pytest>=3,<5", "six>=1,<2", "decorator>=4,<5"], classifiers=[ "Development Status :: 5 - Production/Stable", "Framework :: Pytest", @@ -46,6 +37,7 @@ "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", "Programming Language :: Python", "Topic :: Software Development :: Testing", ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-relaxed-1.1.4/tests/test_display.py new/pytest-relaxed-1.1.5/tests/test_display.py --- old/pytest-relaxed-1.1.4/tests/test_display.py 2018-07-25 03:01:00.000000000 +0200 +++ new/pytest-relaxed-1.1.5/tests/test_display.py 2019-06-14 20:05:29.000000000 +0200 @@ -11,14 +11,9 @@ def _expect_regular_output(testdir): output = testdir.runpytest().stdout.str() - results = ( - """ -behaviors.py .. -other_behaviors.py s.F. -""".lstrip() - ) # Regular results w/ status letters - assert results in output + assert "behaviors.py .." in output + assert "other_behaviors.py s.F." in output # Failure/traceback reporting assert "== FAILURES ==" in output assert "AssertionError" in output @@ -338,6 +333,7 @@ """ Mixed function and class test modules, normal display mode. """ + # TODO: currently undefined; spec never even really worked for this pass @@ -346,5 +342,6 @@ """ Mixed function and class test modules, verbose display mode. """ + # TODO: currently undefined; spec never even really worked for this pass