From 5a8fa84cd78f9bbbbcb4ff9bd5ffc9db0d74d1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Mon, 5 Oct 2020 19:44:43 +0200 Subject: [PATCH 1/4] Fix class reference --- cssselect/xpath.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cssselect/xpath.py b/cssselect/xpath.py index db50c77..eb8be92 100644 --- a/cssselect/xpath.py +++ b/cssselect/xpath.py @@ -180,7 +180,7 @@ def css_to_xpath(self, css, prefix='descendant-or-self::'): This string is prepended to the XPath expression for each selector. The default makes selectors scoped to the context node’s subtree. :raises: - :class:`SelectorSyntaxError` on invalid selectors, + :class:`~cssselect.SelectorSyntaxError` on invalid selectors, :class:`ExpressionError` on unknown/unsupported selectors, including pseudo-elements. :returns: From df0d7fb5956e563cb2dcfb90c7d2a596bef90df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Tue, 6 Oct 2020 20:19:25 +0200 Subject: [PATCH 2/4] Try the 2020 pip resolver --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 32136a0..b4cadcd 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,9 @@ envlist = py27, py34, py35, py36, py37 [testenv] deps= -r tests/requirements.txt - commands = py.test --cov-report term --cov=cssselect +# allow tox virtualenv to upgrade pip/wheel/setuptools +download = true +install_command = + pip install --use-feature=2020-resolver {opts} {packages} From 7b4341990dec8a42f83a39b0a66dfa75961a2cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 7 Oct 2020 00:58:22 +0200 Subject: [PATCH 3/4] Second blind attempt --- tests/requirements.txt | 2 +- tox.ini | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 5232e84..3ff7dea 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ codecov lxml;python_version!="3.4" lxml<=4.3.5;python_version=="3.4" -pytest +pytest<2.10 pytest-cov \ No newline at end of file diff --git a/tox.ini b/tox.ini index b4cadcd..32136a0 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,6 @@ envlist = py27, py34, py35, py36, py37 [testenv] deps= -r tests/requirements.txt + commands = py.test --cov-report term --cov=cssselect -# allow tox virtualenv to upgrade pip/wheel/setuptools -download = true -install_command = - pip install --use-feature=2020-resolver {opts} {packages} From a10041abcb177f7f69ccf6a5401bed38418a2e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 7 Oct 2020 13:59:48 +0200 Subject: [PATCH 4/4] What about forcing the latest pytest? --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3ff7dea..000d5f2 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ codecov lxml;python_version!="3.4" lxml<=4.3.5;python_version=="3.4" -pytest<2.10 +pytest >=4.6, <4.7 # 4.7 drops support for Python 2.7 and 3.4 pytest-cov \ No newline at end of file