From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 12 Aug 2022 23:35:41 +0000 (+0200)
Subject: ci: specify non-editable install in tox tests
X-Git-Tag: 3.1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a27da6e5c25060ed26d8038b621ed0390e08053f;p=thirdparty%2Fpsycopg.git

ci: specify non-editable install in tox tests

Work around tox-dev/tox#2479 (editable installs in tox broken by setuptools
v64) and tox-dev/tox#2480 (failure to use `toxinidir` in `deps`).

Use -e consistently in the linting steps instead, because they are
defined with skip_install=True so it seems a good idea to use it. These
steps don't seem affect by the setuptools issue.
---

diff --git a/psycopg/tox.ini b/psycopg/tox.ini
index a1dc963dd..be1c2557c 100644
--- a/psycopg/tox.ini
+++ b/psycopg/tox.ini
@@ -22,7 +22,7 @@ commands =
 passenv = PG* PSYCOPG_TEST_* PYTEST_ADDOPTS PSYCOPG_IMPL PIP_CONSTRAINT
 extras = test
 deps =
-    -e {toxinidir}/../psycopg_pool
+    ../psycopg_pool
 
 [testenv:dns]
 deps =
diff --git a/psycopg_c/tox.ini b/psycopg_c/tox.ini
index ca4cfc3ac..007f10cd1 100644
--- a/psycopg_c/tox.ini
+++ b/psycopg_c/tox.ini
@@ -10,8 +10,8 @@ commands =
     python -bb -m pytest --lf --lfnf=none --no-collect-ok --randomly-seed=last {posargs}
 passenv = PG* PSYCOPG_TEST_* PYTEST_ADDOPTS PSYCOPG_IMPL PIP_CONSTRAINT
 deps =
-    -e {toxinidir}/../psycopg[test]
-    -e {toxinidir}/../psycopg_pool
+    ../psycopg[test]
+    ../psycopg_pool
 
 [flake8]
 max-line-length = 88
diff --git a/tox.ini b/tox.ini
index 3a899ee50..878be7720 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,8 +24,8 @@ deps =
 [testenv:docs]
 commands = sphinx-build -W -T -b html docs docs/_build/html
 deps =
-    ./psycopg[docs]
-    ./psycopg_pool
+    -e ./psycopg[docs]
+    -e ./psycopg_pool
 
 [testenv:codespell]
 commands = codespell