Suppress MINUS_K_COLON and MINUS_K_DASH warnings until 6.1

They were introduced near 6.0 release where we turn deprecation
warnings into errors, so we need to turn those warnings off until 6.1.

Related to pytest-dev#7361

Author: nicoddemus

src/_pytest/mark/__init__.py

@@ -1,6 +1,5 @@
 """ generic mechanism for marking and selecting python functions. """
 import typing
-import warnings
 from typing import AbstractSet
 from typing import List
 from typing import Optional
@@ -23,8 +22,6 @@
 from _pytest.config import hookimpl
 from _pytest.config import UsageError
 from _pytest.config.argparsing import Parser
-from _pytest.deprecated import MINUS_K_COLON
-from _pytest.deprecated import MINUS_K_DASH
 from _pytest.store import StoreKey
 
 if TYPE_CHECKING:
@@ -181,12 +178,14 @@ def deselect_by_keyword(items: "List[Item]", config: Config) -> None:
 
     if keywordexpr.startswith("-"):
         # To be removed in pytest 7.0.0.
-        warnings.warn(MINUS_K_DASH, stacklevel=2)
+        # Uncomment this after 6.0 release (#7361)
+        # warnings.warn(MINUS_K_DASH, stacklevel=2)
         keywordexpr = "not " + keywordexpr[1:]
     selectuntil = False
     if keywordexpr[-1:] == ":":
         # To be removed in pytest 7.0.0.
-        warnings.warn(MINUS_K_COLON, stacklevel=2)
+        # Uncomment this after 6.0 release (#7361)
+        # warnings.warn(MINUS_K_COLON, stacklevel=2)
         selectuntil = True
         keywordexpr = keywordexpr[:-1]
 

testing/deprecated_test.py

@@ -125,6 +125,7 @@ def test__fillfuncargs_is_deprecated() -> None:
         pytest._fillfuncargs(mock.Mock())
 
 
+@pytest.mark.skip(reason="should be reintroduced in 6.1: #7361")
 def test_minus_k_dash_is_deprecated(testdir) -> None:
     threepass = testdir.makepyfile(
         test_threepass="""
@@ -137,6 +138,7 @@ def test_three(): assert 1
     result.stdout.fnmatch_lines(["*The `-k '-expr'` syntax*deprecated*"])
 
 
+@pytest.mark.skip(reason="should be reintroduced in 6.1: #7361")
 def test_minus_k_colon_is_deprecated(testdir) -> None:
     threepass = testdir.makepyfile(
         test_threepass="""