Merge branch 'nonocov' into 'master'

Remove use of `nocov` environments and factors

See merge request python-devs/importlib_resources!78

Author: warsaw

.gitlab-ci.yml

@@ -11,7 +11,7 @@ qa:
 
 tests:
   script:
-    - tox -e py27-nocov,py34-nocov,py35-nocov,py36-nocov
+    - tox -e py27,py34,py35,py36,py37,py38
 
 coverage:
   script:

importlib_resources/_py2.py

@@ -219,7 +219,7 @@ def contents(package):
         relpath = package_directory.relative_to(archive_path)
         with ZipFile(archive_path) as zf:
             toc = zf.namelist()
-        subdirs_seen = set()                        # type: Set
+        subdirs_seen = set()
         subdirs_returned = []
         for filename in toc:
             path = Path(filename)

tox.ini

@@ -1,13 +1,13 @@
 [tox]
 # Don't cover Python 3.7 since this is just a shim for that version.  Do at
 # least make sure we don't regress!
-envlist = {py27,py34,py35,py36}-{nocov,cov,diffcov},{py37,py38}-nocov,qa,docs
+envlist = {py27,py34,py35,py36}{,-cov,-diffcov},{py37,py38},qa,docs
 skip_missing_interpreters = True
 
 
 [testenv]
 commands =
-    nocov: python -m unittest discover
+    !cov,!diffcov: python -m unittest discover
     cov,diffcov: python -m coverage run {[coverage]rc} -m unittest discover {posargs}
     cov,diffcov: python -m coverage combine {[coverage]rc}
     cov: python -m coverage html {[coverage]rc}