From c89c5b408252c79a056461eaa20f88785659e364 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 27 Oct 2022 15:54:22 +0100
Subject: [PATCH 1/3] Make sure tox-conda is installed

---
 .github/workflows/ci_workflows.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index 68ee6d0..6b50820 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -27,6 +27,7 @@ jobs:
       envs: |
         - linux: mypy
         - linux: py38-conda
+          toxdeps: tox-conda
         - linux: py310
         - linux: py311
         - linux: py39

From e16872621c47f38d8bb135bb32034b3a11ca7a66 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 27 Oct 2022 16:01:17 +0100
Subject: [PATCH 2/3] moar conda

---
 tox.ini | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index f1b6ea5..bf98551 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}{,-conda}
+    py{37,38,39,310,311}{,-conda}
     codestyle
     build_docs
 isolated_build = True
@@ -44,18 +44,22 @@ commands =
     mypy -p parfive
 
 # This env requires tox-conda.
-[testenv:conda]
+[testenv:py{38,39,310,311}-conda]
 extras =
 deps =
 conda_deps =
-    aioftp
+    # core deps
+    tqdm
     aiohttp
-    pytest-asyncio
-    pytest-cov
+    # ftp
+    aioftp
+    # tests
+    pytest
     pytest-localserver
+    pytest-asyncio
     pytest-socket
-    pytest-sugar
-    tqdm
+    pytest-cov
+    aiofiles
 conda_channels = conda-forge
 install_command = pip install --no-deps {opts} {packages}
 commands =

From f761ab8cc288cc5129585b8940cafc423ca8beab Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 27 Oct 2022 16:04:28 +0100
Subject: [PATCH 3/3] fixes

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index bf98551..aa4de4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,11 +7,12 @@ isolated_build = True
 
 [testenv]
 setenv =
+    PYTEST_COMMAND = pytest -vvv -s -raR --pyargs parfive --cov-report=xml --cov=parfive --cov-config={toxinidir}/setup.cfg {toxinidir}/docs {posargs}
 extras =
     ftp
     tests
 commands =
-    pytest -vvv -s -raR --pyargs parfive --cov-report=xml --cov=parfive --cov-config={toxinidir}/setup.cfg {toxinidir}/docs {posargs}
+    {env: PYTEST_COMMAND}
 
 [testenv:build_docs]
 changedir = docs