From d3e1083b7c51de1d8351178211d13d0722f94935 Mon Sep 17 00:00:00 2001
From: Michael Adler <Michael.Adler@intel.com>
Date: Thu, 29 Oct 2020 13:17:29 -0400
Subject: [PATCH 1/2] Fix rtl_src_config Quartus tag for SignalTap files
 (#1734)

---
 platforms/scripts/rtl_src_config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/scripts/rtl_src_config b/platforms/scripts/rtl_src_config
index dfed25387d7e..8dc230250c41 100755
--- a/platforms/scripts/rtl_src_config
+++ b/platforms/scripts/rtl_src_config
@@ -34,7 +34,7 @@ quartus_tag_map = {
     '.qip':  'QIP_FILE',
     '.json': 'MISC_FILE',
     '.tcl':  'SOURCE_TCL_SCRIPT_FILE',
-    '.stp':  'SIGNALTAP_FILE',
+    '.stp':  'USE_SIGNALTAP_FILE',
     '.hex':  'MIF_FILE',
     '.mif':  'MIF_FILE'
 }

From cc1f8e4721c87310abf2def2f8e1dfae612c382b Mon Sep 17 00:00:00 2001
From: Asgard Kaleb Marroquin <12937731+asgardkm@users.noreply.github.com>
Date: Thu, 29 Oct 2020 15:37:27 -0700
Subject: [PATCH 2/2] ci: update python lint jobs (#1735)

* ci: update python lint steps

Travis CI installed linting libraries with default `pip` module, which may be
linking to `python2` on the default Ubuntu 16.04 VM. Install explicitly with
`python3 -m pip`.

Also, add pylint steps in `.github/worksflows/python-static-analysis.yml`, as
well as simply python fileglob detection for the CI push trigger.

Signed-off-by: Marroquin, Asgard <asgard.marroquin@intel.com>

* ci: install pylint in .github ci actions

Signed-off-by: Marroquin, Asgard <asgard.marroquin@intel.com>
---
 .github/workflows/python-static-analysis.yml | 22 +++++++++-----------
 .travis.yml                                  |  8 +++----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml
index ef3a3dc2f499..18975bfb95d7 100644
--- a/.github/workflows/python-static-analysis.yml
+++ b/.github/workflows/python-static-analysis.yml
@@ -3,16 +3,7 @@ name: python static analysis
 on:
   push:
     paths:
-      - 'python/**'
-      - 'tools/extra/fpgabist/**'
-      - 'tools/extra/packager/*.py'
-      - 'tools/extra/packager/metadata/**'
-      - 'tools/extra/packager/test/*.py'
-      - 'tools/extra/pac_hssi_config/*.py'
-      - 'tools/extra/fpgadiag/**'
-      - 'tools/utilities/**'
-      - 'scripts/*.py'
-      - 'platforms/scripts/platmgr/**'
+      - '**.py'
       - '.github/workflows/python-static-analysis.yml'
 
 jobs:
@@ -33,8 +24,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 bandit
-    - name: Lint
+        python -m pip install pylint flake8 bandit
+    - name: Pylint lint
+      run: |
+        pylint $(find ${{ github.workspace }} -name "*.py") \
+          -E -f parseable --disable=E0401 --ignore=__init__.py \
+          --ignore-patterns="test_.*.py" \
+          | tee ${{ github.workspace }}/pylint.log
+    - name: Flake8 lint
       run: |
         flake8 $(find ${{ github.workspace }} -name "*.py") \
           --count --show-source --statistics \
@@ -53,6 +50,7 @@ jobs:
       with:
         name: static-analysis
         path: |
+          ${{ github.workspace }}/pylint.log
           ${{ github.workspace }}/flake8.log
           ${{ github.workspace }}/bandit.log
           ${{ github.workspace }}/bandit.log.csv
diff --git a/.travis.yml b/.travis.yml
index 8a6b7a8c81f1..6a6e9fd39574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ matrix:
     env:
     - BUILD_JOB=Code Style Check
     install:
-    - pip install --user pylint
-    - pip install --user pycodestyle
-    - pip install --user jsonschema
-    - pip install --user jinja2
+    - python3 -m pip install --user pylint
+    - python3 -m pip install --user pycodestyle
+    - python3 -m pip install --user jsonschema
+    - python3 -m pip install --user jinja2
     addons:
       apt:
         packages: