| Andrew Geissler | d159c7f | 2021-09-02 21:05:58 -0500 | [diff] [blame] | 1 | From 637d4400d2bab0457688f950ea18cc4a04147c11 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruno Oliveira <nicoddemus@gmail.com> |
| 3 | Date: Thu, 26 Aug 2021 09:26:51 -0300 |
| 4 | Subject: [PATCH] Allow pluggy >=1.0 |
| 5 | |
| 6 | Now that pluggy 1.0 has been released, we can allow pluggy 1.0 with new pytest versions. |
| 7 | |
| 8 | Upstream-Status: Backport [commit: fbba504] |
| 9 | |
| 10 | Modify to use toml and not tomli. We will create a |
| 11 | python3-tomli recipe when we do an python3-pytest |
| 12 | upgrade. |
| 13 | |
| 14 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> |
| 15 | --- |
| 16 | setup.cfg | 36 ++++++++++++++++++------------------ |
| 17 | 1 file changed, 18 insertions(+), 18 deletions(-) |
| 18 | |
| 19 | diff --git a/setup.cfg b/setup.cfg |
| 20 | index f919a9491..a8aeab813 100644 |
| 21 | --- a/setup.cfg |
| 22 | +++ b/setup.cfg |
| 23 | @@ -32,24 +32,24 @@ project_urls = |
| 24 | Tracker=https://github.com/pytest-dev/pytest/issues |
| 25 | |
| 26 | [options] |
| 27 | -packages = |
| 28 | - _pytest |
| 29 | - _pytest._code |
| 30 | - _pytest._io |
| 31 | - _pytest.assertion |
| 32 | - _pytest.config |
| 33 | - _pytest.mark |
| 34 | - pytest |
| 35 | -install_requires = |
| 36 | - attrs>=19.2.0 |
| 37 | - iniconfig |
| 38 | - packaging |
| 39 | - pluggy>=0.12,<1.0.0a1 |
| 40 | - py>=1.8.2 |
| 41 | - toml |
| 42 | - atomicwrites>=1.0;sys_platform=="win32" |
| 43 | - colorama;sys_platform=="win32" |
| 44 | - importlib-metadata>=0.12;python_version<"3.8" |
| 45 | +packages = |
| 46 | + _pytest |
| 47 | + _pytest._code |
| 48 | + _pytest._io |
| 49 | + _pytest.assertion |
| 50 | + _pytest.config |
| 51 | + _pytest.mark |
| 52 | + pytest |
| 53 | +install_requires = |
| 54 | + attrs>=19.2.0 |
| 55 | + iniconfig |
| 56 | + packaging |
| 57 | + pluggy>=0.12,<2.0 |
| 58 | + py>=1.8.2 |
| 59 | + toml |
| 60 | + atomicwrites>=1.0;sys_platform=="win32" |
| 61 | + colorama;sys_platform=="win32" |
| 62 | + importlib-metadata>=0.12;python_version<"3.8" |
| 63 | python_requires = >=3.6 |
| 64 | package_dir = |
| 65 | =src |