Merge pull request #653 from Athanasius/fix/652-PR-Checks-forked-branch

Fixing PR-Checks for forked branches

.github/workflows/pr-checks.yml

@@ -16,21 +16,35 @@ jobs:
     runs-on: ubuntu-18.04
 
     steps:
-    - name: Checkout commits
+
+    ####################################################################
+    # Checkout the necessary commits
+    ####################################################################
+    # We need the repo from the 'head' of the PR, not what it's
+    # based on.
+    - name: Checkout head commits
+      # https://github.com/actions/checkout
       uses: actions/checkout@v2
       with:
-        fetch-depth: 0
-    - name: Checkout base ref
-      uses: actions/checkout@v2
-      with:
-        ref: ${{github.base_ref}}
-        fetch-depth: 0
-    - name: Checkout head of PR
-      uses: actions/checkout@v2
-      with:
-        ref: ${{github.head_ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
         fetch-depth: 0
 
+    # But we do need the base references
+    - name: Fetch base commits
+      env:
+        BASE_REPO_URL: ${{github.event.pull_request.base.repo.svn_url}}
+        BASE_REPO_OWNER: ${{github.event.pull_request.base.repo.owner.login}}
+
+      run: |
+        # Add the 'base' repo as a new remote
+        git remote add ${BASE_REPO_OWNER} ${BASE_REPO_URL}
+        # And then fetch its references
+        git fetch ${BASE_REPO_OWNER}
+    ####################################################################
+    
+    ####################################################################
+    # Get Python set up
+    ####################################################################
     - name: Set up Python 3.7
       uses: actions/setup-python@v2
       with:
@@ -40,13 +54,29 @@ jobs:
         python -m pip install --upgrade pip
         pip install flake8
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; elif [ -f requirements.txt ]; then pip install -r requirements.txt ; fi
+    ####################################################################
 
+    ####################################################################
+    # Show full github context to aid debugging.
+    ####################################################################
+    - name: Show github context
+      run: |
+        env
+        cat $GITHUB_EVENT_PATH
+    ####################################################################
+
+    ####################################################################
+    # Lint with flake8
+    ####################################################################
     - name: Lint with flake8
       env:
+        BASE_REPO_URL: ${{github.event.pull_request.base.repo.svn_url}}
+        BASE_REPO_OWNER: ${{github.event.pull_request.base.repo.owner.login}}
         BASE_REF: ${{github.base_ref}}
 
       run: |
         # stop the build if there are Python syntax errors or undefined names, ignore existing 
-        git diff "refs/remotes/origin/${BASE_REF}" -- | flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --diff
+        git diff "refs/remotes/${BASE_REPO_OWNER}/${BASE_REF}" -- | flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --diff
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        git diff "refs/remotes/origin/${BASE_REF}" -- | flake8 . --count --exit-zero --statistics --diff
+        git diff "refs/remotes/${BASE_REPO_OWNER}/${BASE_REF}" -- | flake8 . --count --exit-zero --statistics --diff
+    ####################################################################

EDMCLogging.py

@@ -5,6 +5,7 @@ members on the logging.LogRecord instance for use in logging.Formatter()
 strings.
 """
 
+# A small comment
 # So that any warning about accessing a protected member is only in one place.
 from sys import _getframe as getframe
 import inspect