Skip to content

Commit

Permalink
Merge pull request #1000 from StochSS/develop
Browse files Browse the repository at this point in the history
Release of StochSS 2.1
  • Loading branch information
BryanRumsey authored Sep 24, 2020
2 parents 93c48a7 + f32262f commit 0e44674
Show file tree
Hide file tree
Showing 241 changed files with 23,517 additions and 3,161 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
.gitignore
examples/
internal/
README.md
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ DOCKER_STOCHSS_IMAGE=stochss-lab

DOCKER_BASE_IMAGE=jupyter/minimal-notebook:latest

DOCKER_WORKING_DIR=$(PWD)/local_data

JUPYTER_CONFIG_DIR=/opt/stochss-config/.jupyter
59 changes: 59 additions & 0 deletions .github/workflows/pylint_on_pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: PyLint On Pull Request
on: [pull_request]
jobs:
build:
runs-on: ubuntu-latest
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 ::set-env name=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.-]+)
env:
HEAD_REF: ${{ github.event.pull_request.head.ref }}
if: always()
- name: Checkout Head
run: git checkout $HEAD_REF
env:
HEAD_REF: ${{ github.event.pull_request.head.ref }}
- name: Get Lint Delta Sign (+/-)
run: echo ::set-env name=PASSING_SCORE::$(git diff --name-only --diff-filter=M $BASE_REF | grep -E "\.py" | xargs pylint | grep -Eo "10, [+-]" | grep -Eo [+-] )
env:
BASE_REF: ${{ github.event.pull_request.base.ref }}
if: always()
- name: Get Head Lint Score
run: echo ::set-env name=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.-]+)
env:
BASE_REF: ${{ github.event.pull_request.base.ref }}
if: always()
- name: Get Added Files Lint Score
run: echo ::set-env name=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.-]+)
env:
BASE_REF: ${{ github.event.pull_request.base.ref }}
if: always()
- 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 "Lint of files added by head:"
echo ${{ env.ADDED_LINT }}
if: always()
- name: Fail If Negative Delta
run: exit 1
if: env.PASSING_SCORE == '-'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
local_data/
node_modules/
.power_users
*.bundle.js
Expand All @@ -6,6 +7,7 @@ stochss-file-browser.html
stochss-model-editor.html
stochss-workflow-manager.html
stochss-workflow-selection.html
stochss-project-manager.html
*.swp
*.swo
package-lock.json
Expand Down
Loading

0 comments on commit 0e44674

Please sign in to comment.