From aa1d0dfbfb720e8c1f63f2d13305d9e42fcf2d1e Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Mon, 26 Oct 2020 19:55:39 +0100
Subject: [PATCH] adjust tests

---
 Makefile              | 4 ++--
 requirements.txt      | 5 ++++-
 setup.cfg             | 1 -
 setup.py              | 9 +++++----
 test-requirements.txt | 1 -
 tox.ini               | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7d8f8d6a..d2ab9e3d 100644
--- a/Makefile
+++ b/Makefile
@@ -133,11 +133,11 @@ diff-cover.html: coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: FORCE
-	python setup.py test --addopts "tests"  #-n auto --dist=loadfile"
+	python setup.py test # --addopts "-n auto --dist=loadfile"
 
 ## testcov     : run the ${MODULE} test suite and collect coverage
 testcov: $(pysources)
-	python setup.py test --addopts "tests --cov ${MODULE}" # -n auto --dist=loadfile"
+	python setup.py test --addopts "--cov ${MODULE}" # -n auto --dist=loadfile"
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > $@
diff --git a/requirements.txt b/requirements.txt
index 477e93a4..b4b8c861 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,5 @@
 ruamel.yaml<=0.16.5,>=0.12.4
-schema-salad
+requests
+schema-salad >= 7, < 8
+typing_extensions
+cwltool
diff --git a/setup.cfg b/setup.cfg
index 28e62301..e207a6dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,6 @@ extend-ignore = E203, W503
 test=pytest
 
 [tool:pytest]
-addopts=--pyargs cwl_utils
 testpaths = tests
 
 [tool:isort]
diff --git a/setup.py b/setup.py
index 102166a4..051e79d3 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 
-from setuptools import find_packages, setup
+from setuptools import setup
 
 exec(open("cwl_utils/__meta__.py").read())
 
@@ -13,17 +13,18 @@
     license="Apache 2.0",
     author="Common workflow language working group",
     author_email="common-workflow-language@googlegroups.com",
-    packages=find_packages(),
+    packages=["cwl_utils", "cwl_utils.tests"],
+    package_dir={"cwl_utils.tests": "tests"},
     python_requires=">=3.6",
     install_requires=[
         "ruamel.yaml<=0.16.5,>=0.12.4",
-        "six",
         "requests",
         "schema-salad >= 7, < 8",
         "typing_extensions",
+        "cwltool",
     ],
     setup_requires=[] + pytest_runner,
-    tests_require=["pytest<7", "cwltool", "requests"],
+    tests_require=["pytest<7", "cwltool"],
     test_suite="tests",
     scripts=[
         "cwl_utils/docker_extract.py",
diff --git a/test-requirements.txt b/test-requirements.txt
index 20af9e9e..51532f30 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,2 @@
 pytest < 7
 pytest-cov
-cwltool
diff --git a/tox.ini b/tox.ini
index 7db0b9cf..d5a68ab0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,7 @@ setenv =
 commands =
   py{36,37,38,39}-unit: python -m pip install -U pip setuptools wheel
   py{36,37,38,39}-unit: python -m pip install -e .
-  py{36,37,38,39}-unit: coverage run --parallel-mode -m pytest --strict tests {posargs}
+  py{36,37,38,39}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
   py{36,37,38,39}-unit: coverage combine
   py{36,37,38,39}-unit: coverage report
   py{36,37,38,39}-unit: coverage xml