adjust tests

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 $^ > $@

requirements.txt

@@ -1,2 +1,5 @@
 ruamel.yaml<=0.16.5,>=0.12.4
-schema-salad
+requests
+schema-salad >= 7, < 8
+typing_extensions
+cwltool

setup.cfg

@@ -7,7 +7,6 @@ extend-ignore = E203, W503
 test=pytest
 
 [tool:pytest]
-addopts=--pyargs cwl_utils
 testpaths = tests
 
 [tool:isort]

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",

test-requirements.txt

@@ -1,3 +1,2 @@
 pytest < 7
 pytest-cov
-cwltool

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