Merge pull request #106 from common-workflow-language/codeql-analysis

install codeql-analysis.yml

Author: mr-c

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,34 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 17 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: python
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

cwltest/__init__.py

@@ -9,9 +9,10 @@
 import tempfile
 import threading
 import time
-from typing import Any, Dict, List, Optional, Text
+from typing import Any, Dict, List, Optional, Text, Union
 from concurrent.futures import ThreadPoolExecutor
 from collections import defaultdict
+from rdflib import Graph
 
 import ruamel.yaml as yaml
 import ruamel.yaml.scanner as yamlscanner
@@ -356,7 +357,7 @@ def main():  # type: () -> int
         return 1
 
     schema_resource = pkg_resources.resource_stream(__name__, "cwltest-schema.yml")
-    cache = {"https://w3id.org/cwl/cwltest/cwltest-schema.yml": schema_resource.read().decode("utf-8")}
+    cache = {"https://w3id.org/cwl/cwltest/cwltest-schema.yml": schema_resource.read().decode("utf-8")}  # type: Optional[Dict[str, Union[str, Graph, bool]]]
     (document_loader,
      avsc_names,
      schema_metadata,

requirements.txt

@@ -1,3 +1,3 @@
-schema-salad >= 2.0
+schema-salad >= 5.0.20200220195218, <8
 junit-xml >= 1.8
 pytest < 6

setup.py

@@ -15,7 +15,7 @@
 except ImportError:
     tagger = egg_info_cmd.egg_info
 
-install_requires = ["schema-salad >= 5.0.20200220195218", "junit-xml >= 1.8"]
+install_requires = ["schema-salad >= 5.0.20200220195218, < 8", "junit-xml >= 1.8"]
 
 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
 pytest_runner = ["pytest < 6", "pytest-runner < 5"] if needs_pytest else []

tox.ini

@@ -32,14 +32,14 @@ deps =
   py{35,36,37,38}-unit: pytest-xdist
   py{35,36,37,38}-unit: pytest-cov
   py{36,37,38}-lint: flake8
-  py{35,36,37,38}-mypy: mypy==0.761
+  py{35,36,37,38}-mypy: mypy==0.782
 
 setenv =
   py{35,36,37,38}-unit: LC_ALL = C
 
 commands =
   py{35,36,37,38}-unit: python -m pip install -U pip setuptools wheel
-  py{35,36,37,38}-unit: python -m pip install -e .[deps]
+  py{35,36,37,38}-unit: python -m pip install -e .
   py{35,36,37,38}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
   py{35,36,37,38}-unit: coverage combine
   py{35,36,37,38}-unit: coverage report