Compare commits
No commits in common. "6e92bd59af7fed310094c11af17b89413c3c67c0" and "322ef60ad0018a4bca650ffa991fa7fe9b336736" have entirely different histories.
6e92bd59af
...
322ef60ad0
@ -1,43 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
Binary file not shown.
@ -1,58 +0,0 @@
|
|||||||
Name: python-docopt
|
|
||||||
Version: 0.6.2
|
|
||||||
Release: 14
|
|
||||||
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 \
|
|
||||||
docopt helps you define the interface for your command-line app, and automatically generate a \
|
|
||||||
parser for it.\
|
|
||||||
docopt is based on conventions that have been used for decades in help messages and man pages for \
|
|
||||||
describing a program interface. An interface description in docopt is such a help message, but \
|
|
||||||
formalized.
|
|
||||||
|
|
||||||
%description %_description
|
|
||||||
|
|
||||||
%package -n python3-docopt
|
|
||||||
Summary: Command-line interface description language
|
|
||||||
%{?python_provide:%python_provide python3-docopt}
|
|
||||||
BuildRequires: python3-devel python3-pytest python3-setuptools
|
|
||||||
|
|
||||||
%description -n python3-docopt %_description
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -n docopt-%{version} -p1
|
|
||||||
|
|
||||||
%build
|
|
||||||
%py3_build
|
|
||||||
|
|
||||||
%install
|
|
||||||
%py3_install
|
|
||||||
|
|
||||||
%check
|
|
||||||
py.test-3 -v
|
|
||||||
|
|
||||||
%files -n python3-docopt
|
|
||||||
%license LICENSE-MIT
|
|
||||||
%doc README.rst
|
|
||||||
%{python3_sitelib}/docopt*
|
|
||||||
%{python3_sitelib}/__pycache__/*
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Oct 25 2022 zhangruifang <zhangruifang1@h-partners.com> - 0.6.2-14
|
|
||||||
- Rebuild for next release
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
||||||
* Wed Jan 08 2020 zhouyihang <zhouyihang1@huawei.com> - 0.6.2-11
|
|
||||||
- Package init
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: github
|
|
||||||
src_repo: docopt/docopt
|
|
||||||
tag_prefix: ^v
|
|
||||||
seperator: .
|
|
||||||
Loading…
x
Reference in New Issue
Block a user