Merge branch 'master' into testing-windows

Author: mr-c

cwltool/stdfsaccess.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 import glob
 import os
+from io import open
 from typing import BinaryIO, List, Union, Text, IO, overload
 
 from .utils import onWindows

setup.py

@@ -8,12 +8,6 @@
 SETUP_DIR = os.path.dirname(__file__)
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-# if python3 runtime and `setup.py install` is called
-if sys.version_info.major == 3 and sys.argv[1] == 'install':
-    print("Aborting installation. CWL Tool doesn't support Python 3 currently.")
-    print("Install using Python 2 pip.")
-    exit(1)
-
 try:
     import gittaggers
 
@@ -85,9 +79,9 @@
           'Operating System :: POSIX',
           'Operating System :: POSIX :: Linux',
           'Operating System :: OS Independent',
-          # 'Operating System :: Microsoft :: Windows',  # soon!
-          # 'Operating System :: Microsoft :: Windows :: Windows 10',  # soon!
-          # 'Operating System :: Microsoft :: Windows :: Windows 8.1',  # soon!
+          'Operating System :: Microsoft :: Windows',
+          'Operating System :: Microsoft :: Windows :: Windows 10',
+          'Operating System :: Microsoft :: Windows :: Windows 8.1',
           # 'Operating System :: Microsoft :: Windows :: Windows 8',  # not tested
           # 'Operating System :: Microsoft :: Windows :: Windows 7',  # not tested
           'Programming Language :: Python :: 2',