From 0789acf0e653c2d5b5ce1cf06c78762d5562391c Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 09:41:59 -0700 Subject: [PATCH 1/2] Add argcomplete dependency to conda test session. --- requirements-conda-test.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-conda-test.txt b/requirements-conda-test.txt index b639f8fa..0fa309a3 100644 --- a/requirements-conda-test.txt +++ b/requirements-conda-test.txt @@ -1,3 +1,4 @@ +argcomplete >=1.9.4,<2.0 colorlog >=2.6.1,<4.0.0 py >=1.4.0,<2.0.0 virtualenv >=14.0.0 From 8d93b91d8aae476b09d87684a4e2b9777aa90542 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 09:47:11 -0700 Subject: [PATCH 2/2] Prefer dependencies from conda-forge --- noxfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index b2d9638d..9076c7f1 100644 --- a/noxfile.py +++ b/noxfile.py @@ -35,7 +35,9 @@ def tests(session): @nox.session(python=["3.5", "3.6", "3.7"], venv_backend="conda") def conda_tests(session): """Run test suite with pytest.""" - session.conda_install("--file", "requirements-conda-test.txt") + session.conda_install( + "--file", "requirements-conda-test.txt", "--channel", "conda-forge" + ) session.install("contexter", "--no-deps") session.install("-e", ".", "--no-deps") tests = session.posargs or ["tests/"]