From 2748feed38f826057f85d14229557304dbdfb26d Mon Sep 17 00:00:00 2001
From: Keri Volans <keri.volans@gmail.com>
Date: Mon, 1 Jun 2020 16:19:40 +0100
Subject: [PATCH 1/2] 7291: Replace py.iniconfig with iniconfig

---
 changelog/7291.trivial.rst      | 1 +
 setup.py                        | 1 +
 src/_pytest/config/findpaths.py | 8 +++++---
 src/_pytest/pytester.py         | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changelog/7291.trivial.rst

diff --git a/changelog/7291.trivial.rst b/changelog/7291.trivial.rst
new file mode 100644
index 00000000000..9bc99f6517b
--- /dev/null
+++ b/changelog/7291.trivial.rst
@@ -0,0 +1 @@
+Replaced usages of py.iniconfig with iniconfig.
diff --git a/setup.py b/setup.py
index cd2ecbe07f7..79fef1f4dda 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@
     'colorama;sys_platform=="win32"',
     "pluggy>=0.12,<1.0",
     'importlib-metadata>=0.12;python_version<"3.8"',
+    "iniconfig",
 ]
 
 
diff --git a/src/_pytest/config/findpaths.py b/src/_pytest/config/findpaths.py
index f4f62e06b8f..2b252c4f474 100644
--- a/src/_pytest/config/findpaths.py
+++ b/src/_pytest/config/findpaths.py
@@ -6,6 +6,8 @@
 from typing import Tuple
 
 import py
+from iniconfig import IniConfig
+from iniconfig import ParseError
 
 from .exceptions import UsageError
 from _pytest.compat import TYPE_CHECKING
@@ -40,8 +42,8 @@ def getcfg(args, config=None):
                 p = base.join(inibasename)
                 if exists(p):
                     try:
-                        iniconfig = py.iniconfig.IniConfig(p)
-                    except py.iniconfig.ParseError as exc:
+                        iniconfig = IniConfig(p)
+                    except ParseError as exc:
                         raise UsageError(str(exc))
 
                     if (
@@ -119,7 +121,7 @@ def determine_setup(
 ) -> Tuple[py.path.local, Optional[str], Any]:
     dirs = get_dirs_from_args(args)
     if inifile:
-        iniconfig = py.iniconfig.IniConfig(inifile)
+        iniconfig = IniConfig(inifile)
         is_cfg_file = str(inifile).endswith(".cfg")
         sections = ["tool:pytest", "pytest"] if is_cfg_file else ["pytest"]
         for section in sections:
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index 9df86a22fa3..fc4e4d853c3 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -22,6 +22,7 @@
 from weakref import WeakKeyDictionary
 
 import py
+from iniconfig import IniConfig
 
 import pytest
 from _pytest._code import Source
@@ -683,7 +684,7 @@ def makeini(self, source):
     def getinicfg(self, source):
         """Return the pytest section from the tox.ini config file."""
         p = self.makeini(source)
-        return py.iniconfig.IniConfig(p)["pytest"]
+        return IniConfig(p)["pytest"]
 
     def makepyfile(self, *args, **kwargs):
         r"""Shortcut for .makefile() with a .py extension.

From da5851c13e3dd992deb8267110e3099fc0216ced Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 2 Jun 2020 11:01:37 -0300
Subject: [PATCH 2/2] Update changelog/7291.trivial.rst

---
 changelog/7291.trivial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/7291.trivial.rst b/changelog/7291.trivial.rst
index 9bc99f6517b..8f41528aa56 100644
--- a/changelog/7291.trivial.rst
+++ b/changelog/7291.trivial.rst
@@ -1 +1 @@
-Replaced usages of py.iniconfig with iniconfig.
+Replaced ``py.iniconfig`` with `iniconfig <https://pypi.org/project/iniconfig/>`__.