Merge pull request #327 from StochSS/develop

Release v1.1.2

Author: briandrawert

.github/workflows/pylint_on_pull_request.yml

@@ -0,0 +1,75 @@
+name: PyLint On Pull Request
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Set Up Python
+      uses: actions/setup-python@v2
+    - name: Install PyLint
+      run: pip install --upgrade pylint
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Checkout Head
+      run: git checkout $HEAD_REF
+      env:
+        HEAD_REF: ${{ github.event.pull_request.head.ref }}
+    - name: Checkout Base
+      run: git checkout $BASE_REF
+      env:
+        BASE_REF: ${{ github.event.pull_request.base.ref }}
+    - name: Get Base Lint Score
+      run: |
+        echo BASE_LINT=$(git diff --name-only --diff-filter=M $HEAD_REF | grep -E "\.py" | xargs pylint | grep -E -o "at [0-9.-]+" | grep -E -o [0-9.-]+) >> $GITHUB_ENV
+      env:
+        HEAD_REF: ${{ github.event.pull_request.head.ref }}
+      if: always()
+    - name: Set Base Lint to 0
+      run: echo BASE_LINT=0 >> $GITHUB_ENV
+      if: env.BASE_LINT == ''
+    - name: Checkout Head
+      run: git checkout $HEAD_REF
+      env:
+        HEAD_REF: ${{ github.event.pull_request.head.ref }}
+    - name: Get Head Lint Score
+      run: |
+        echo HEAD_LINT=$(git diff --name-only --diff-filter=M $BASE_REF | grep -E "\.py" | xargs pylint | grep -E -o "at [0-9.-]+" | grep -E -o [0-9.-]+) >> $GITHUB_ENV
+      env:
+        BASE_REF: ${{ github.event.pull_request.base.ref }}
+      if: always()
+    - name: Set Head Lint to 0
+      run: echo HEAD_LINT=0 >> $GITHUB_ENV
+      if: env.HEAD_LINT == ''
+    - name: Get Added Files Lint Score
+      run: |
+        echo ADDED_LINT=$(git diff --name-only --diff-filter=A $BASE_REF | grep -E "\.py" | xargs pylint | grep -E -o "at [0-9.-]+" | grep -E -o [0-9.-]+) >> $GITHUB_ENV
+      env:
+        BASE_REF: ${{ github.event.pull_request.base.ref }}
+      if: always()
+    - name: Get Delta
+      run: |
+        import os
+        base = float(os.environ['BASE_LINT'])
+        head = float(os.environ['HEAD_LINT'])
+        delta = head - base
+        os.popen(f"echo DELTA={round(delta, 2)} >> $GITHUB_ENV")
+      shell: python
+    - name: Display Results
+      run: |
+        echo "Lint of modified files in base:"
+        echo ${{ env.BASE_LINT }}
+        echo "Lint of modified files in head:"
+        echo ${{ env.HEAD_LINT }}
+        echo "Delta (+/-):"
+        echo ${{ env.DELTA }}
+        echo "Lint of files added by head:"
+        echo ${{ env.ADDED_LINT }}
+      if: always()
+    - name: Fail If Negative Delta
+      run: |
+        import os
+        if float(os.environ['HEAD_LINT']) < 9 and float(os.environ['DELTA']) < 0:
+            raise Exception("Head lint score < 9 and negative delta.")
+      shell: python

.github/workflows/update-docs.yml

@@ -0,0 +1,46 @@
+name: Publish SpatialPy Docs
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Initialize environment
+      uses: actions/checkout@v2
+      with:
+        ref: main
+        fetch-depth: 0
+      
+    - name: Install Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.7'
+
+    - name: Install Sphinx Dependency
+      run: |
+        python3 -m pip install --upgrade pip
+        python3 -m pip install -U sphinx
+        python3 -m pip install numpy
+        python3 -m pip install -r requirements.txt
+
+    - name: Update the Docs
+      working-directory: docs
+      run: |
+        make build-docs
+
+    - name: Commit Changes
+      working-directory: docs
+      run: |
+        git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+        make commit-docs
+
+    - name: Push Changes
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: main

docs/Makefile

@@ -84,25 +84,34 @@ autobuild: $(FORMAT)
 clean:
 	rm -rf "$(BUILDDIR)"
 
-publish:
+build-docs:
+	git pull
 	make clean
 	git stash
-	git checkout gh-pages
+	git checkout main
 	make html
+
+commit-docs:
 	-git add -f "$(BUILDDIR)"
-	-git commit -m "Latest build." "$(BUILDDIR)"
-	git push origin gh-pages -f
-	make clean
-	git checkout @{-1}
-	git stash pop
+	-git commit -m "Latest docs build." "$(BUILDDIR)"
 
-publish-release: publish
+publish:
 	make clean
 	git stash
-	git checkout main
+	git pull
+	git checkout staging
 	make html
 	-git add -f "$(BUILDDIR)"
 	-git commit -m "Latest docs build." "$(BUILDDIR)"
+	git push origin staging -f
+	make clean
+	git checkout gh-pages
+	git pull origin staging
+	git push origin gh-pages -f
+	git checkout @{-2}
+	git stash pop
+
+publish-release: build-docs commit-docs
 	git push origin main -f
 	make clean
 	git checkout @{-1}

docs/build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 8b8c7260a070827b00291bef99cea017
+config: aa9a9a3c9380df45ffa4c7a40b7ba182
 tags: 645f666f9bcd5a90fca523b33c5a78b7