!6 add pytest 6.2+ support

Merge pull request !6 from 桐小哥/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-10 06:27:08 +00:00 committed by Gitee
commit 57ffbd8e80
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 49 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From 8e06097d68b3f2fb9f44324119de5cefb7a42506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 7 Jun 2021 00:52:25 +0200
Subject: [PATCH] pytest: Use Node.from_parent(...)
Fixes https://github.com/docopt/docopt/issues/483
See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
---
conftest.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/conftest.py b/conftest.py
index f5e8c7b..c4c0bb5 100644
--- a/conftest.py
+++ b/conftest.py
@@ -11,7 +11,10 @@
def pytest_collect_file(path, parent):
if path.ext == ".docopt" and path.basename.startswith("test"):
- return DocoptTestFile(path, parent)
+ if hasattr(DocoptTestFile, "from_parent"):
+ return DocoptTestFile.from_parent(parent, fspath=path)
+ else:
+ return DocoptTestFile(path, parent)
def parse_test(raw):
@@ -41,7 +44,13 @@ def collect(self):
for name, doc, cases in parse_test(raw):
name = self.fspath.purebasename
for case in cases:
- yield DocoptTestItem("%s(%d)" % (name, index), self, doc, case)
+ if hasattr(DocoptTestItem, "from_parent"):
+ yield DocoptTestItem.from_parent(parent=self,
+ name="%s(%d)" % (name, index),
+ doc=doc,
+ case=case)
+ else:
+ yield DocoptTestItem("%s(%d)" % (name, index), self, doc, case)
index += 1

View File

@ -1,11 +1,13 @@
Name: python-docopt
Version: 0.6.2
Release: 12
Release: 13
Summary: Command-line interface description language
License: MIT
URL: http://docopt.org/
Source0: https://github.com/docopt/docopt/archive/%{version}.tar.gz#/docopt-%{version}.tar.gz
Patch6000: backport-pytest-Use-Node.from_parent.patch
BuildArch: noarch
%global _description \
@ -43,6 +45,9 @@ py.test-3 -v
%{python3_sitelib}/__pycache__/*
%changelog
* Mon Jan 10 2022 shixuantong <shixuantong@huawei.com> - 0.6.2-13
- add pytest 6.2+ support
* Sat Oct 24 2020 tianwei <tianwei12@huawei.com> - 0.6.2-12
- delete python2