#8 Update to 4.3.1
Merged a year ago by thm. Opened a year ago by churchyard.
rpms/ churchyard/pytest 4.3.0  into  master

file added
+42

@@ -0,0 +1,42 @@ 

+ From d32ab6029feb178df664e0d347e234cc4480eb7d Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

+ Date: Tue, 12 Mar 2019 16:28:10 +0100

+ Subject: [PATCH] Fix pytest tests invocation with custom PYTHONPATH

+ 

+ Fixes https://github.com/pytest-dev/pytest/issues/4913

+ 

+ Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>

+ ---

+  changelog/4913.trivial.rst | 1 +

+  testing/test_collection.py | 3 ++-

+  2 files changed, 3 insertions(+), 1 deletion(-)

+  create mode 100644 changelog/4913.trivial.rst

+ 

+ diff --git a/changelog/4913.trivial.rst b/changelog/4913.trivial.rst

+ new file mode 100644

+ index 000000000..7846775cc

+ --- /dev/null

+ +++ b/changelog/4913.trivial.rst

+ @@ -0,0 +1 @@

+ +Fix pytest tests invocation with custom ``PYTHONPATH``.

+ diff --git a/testing/test_collection.py b/testing/test_collection.py

+ index 97c46d8c2..37f7ad89c 100644

+ --- a/testing/test_collection.py

+ +++ b/testing/test_collection.py

+ @@ -2,6 +2,7 @@

+  from __future__ import division

+  from __future__ import print_function

+  

+ +import os

+  import pprint

+  import sys

+  import textwrap

+ @@ -1108,7 +1109,7 @@ def test_collect_pyargs_with_testpaths(testdir, monkeypatch):

+      """

+          )

+      )

+ -    monkeypatch.setenv("PYTHONPATH", str(testdir.tmpdir))

+ +    monkeypatch.setenv("PYTHONPATH", str(testdir.tmpdir), prepend=os.pathsep)

+      with root.as_cwd():

+          result = testdir.runpytest_subprocess()

+      result.stdout.fnmatch_lines(["*1 passed in*"])

file added
+32

@@ -0,0 +1,32 @@ 

+ From 134b957bf42ef92f892ace04651c87ab6d09999f Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

+ Date: Thu, 14 Mar 2019 12:15:05 +0100

+ Subject: [PATCH] Remove deprecated Sphinx directive add_description_unit()

+ 

+ Partial solution for https://github.com/pytest-dev/pytest/issues/4912

+ ---

+  changelog/4912.trivial.rst | 1 +

+  doc/en/conf.py             | 2 +-

+  2 files changed, 2 insertions(+), 1 deletion(-)

+  create mode 100644 changelog/4912.trivial.rst

+ 

+ diff --git a/changelog/4912.trivial.rst b/changelog/4912.trivial.rst

+ new file mode 100644

+ index 000000000..9c5ca6d8e

+ --- /dev/null

+ +++ b/changelog/4912.trivial.rst

+ @@ -0,0 +1 @@

+ +Remove deprecated Sphinx directive, ``add_description_unit()``.

+ diff --git a/doc/en/conf.py b/doc/en/conf.py

+ index 74a43596e..5daa15a06 100644

+ --- a/doc/en/conf.py

+ +++ b/doc/en/conf.py

+ @@ -335,7 +335,7 @@

+  def setup(app):

+      # from sphinx.ext.autodoc import cut_lines

+      # app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))

+ -    app.add_description_unit(

+ +    app.add_object_type(

+          "confval",

+          "confval",

+          objname="configuration value",

file modified
+22 -9

@@ -2,12 +2,18 @@ 

  %global pylib_version 1.5.0

  

  Name:           pytest

- Version:        3.9.3

- Release:        3%{?dist}

+ Version:        4.3.1

+ Release:        1%{?dist}

  Summary:        Simple powerful testing with Python

  License:        MIT

- URL:            http://pytest.org

- Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz

+ URL:            https://pytest.org

+ Source0:        %{pypi_source}

+ 

+ # Don't override our PYTHONPATH in tests

+ Patch1:         https://github.com/pytest-dev/pytest/pull/4914.patch

+ 

+ # Update one call to Sphinx 2.0

+ Patch2:         https://github.com/pytest-dev/pytest/pull/4922.patch

  

  # The test in this specfile use pytest-timeout

  # When building pytest for the first time with new Python version

@@ -25,9 +31,11 @@ 

  %bcond_without docs

  

  %if %{with docs}

- BuildRequires:  %{_bindir}/sphinx-build-3

- BuildRequires:  python3-sphinxcontrib-trio

  BuildRequires:  %{_bindir}/rst2html

+ BuildRequires:  python3-pygments-pytest

+ BuildRequires:  python3-sphinx

+ BuildRequires:  python3-sphinx-removed-in

+ BuildRequires:  python3-sphinxcontrib-trio

  %endif

  

  BuildArch:      noarch

@@ -42,6 +50,7 @@ 

  BuildRequires:  python2-devel

  BuildRequires:  python2-funcsigs

  BuildRequires:  python2-hypothesis

+ BuildRequires:  python2-mock

  BuildRequires:  python2-more-itertools >= 4.0.0

  BuildRequires:  python2-pathlib2 >= 2.2.0

  BuildRequires:  python2-pluggy >= 0.7

@@ -57,7 +66,6 @@ 

  %if %{with optional_tests}

  BuildRequires:  python2-decorator

  BuildRequires:  python2-jinja2

- BuildRequires:  python2-mock

  BuildRequires:  python2-nose

  BuildRequires:  python2-twisted

  %endif

@@ -91,7 +99,6 @@ 

  BuildRequires:  python3-argcomplete

  BuildRequires:  python3-decorator

  BuildRequires:  python3-jinja2

- BuildRequires:  python3-mock

  BuildRequires:  python3-nose

  BuildRequires:  python3-twisted

  %endif

@@ -103,7 +110,7 @@ 

  py.test provides simple, yet powerful testing for Python.

  

  %prep

- %autosetup

+ %autosetup -p1

  

  %build

  %py2_build

@@ -199,6 +206,12 @@ 

  %{python3_sitelib}/__pycache__/pytest.*

  

  %changelog

+ * Sat Mar 16 2019 Miro Hrončok <mhroncok@redhat.com> - 4.3.1-1

+ - Update to 4.3.1

+ 

+ * Tue Mar 12 2019 Miro Hrončok <mhroncok@redhat.com> - 4.3.0-1

+ - Update to 4.3.0 and fix FTBFS (#1671167, #1687384)

+ 

  * Mon Feb 18 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.9.3-3

  - Enable python dependency generator

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (pytest-3.9.3.tar.gz) = 03ab708ebff936dc296d8c42c549789db42916ac8d4a1df817aebdcdfcb1d0c45126e6238f958eb1523938db6529baa282a9f2ff5742295b2113873abe07ef83

+ SHA512 (pytest-4.3.1.tar.gz) = 5c76100b9efc9176803807a54ff25bfaba065fe3e8fea28b9b2f3ade289056d174e0cc4e1f399eba4ee8642e8990f43f5dc68b59cf55b7d81a43cd7cb363f542

no initial comment

Missing packages added. Will amend to make the docs build.

rebased onto ed8c0c8

a year ago

1 new commit added

  • Update to 4.3.1
a year ago

Might as well go to 4.4.0 now? :)

My idea was to push tis first to unblock other things and open another PR for 4.4 later. But since you need this for new xdist and 4.3 and 4.4 don't differ that much, why not. But I'll get to it on Monday. Will be offline the entire weekend from today in couple minutes.

No need to rush it for xdist. It's not that important.

Pull-Request has been merged by thm

a year ago