Merge dev into release for V3 #major

Author: jgostick

.coveragerc

@@ -6,13 +6,17 @@ source =
 [report]
 
 omit =
-    tests/*
-    scripts/*
-    examples/*
     */__init__.py
-    openpnm/__version__.py
+    docs/*
     example.py
+    examples/*
+    openpnm/_skgraph/visualization/*
+    openpnm/solvers/_petsc.py
+    openpnm/__version__.py
+    openpnm/visualization/*
+    scripts/*
     setup.py
+    tests/*
 
 exclude_lines =
     pragma: no cover

.github/workflows/bump-version-dev.yml

@@ -0,0 +1,54 @@
+name: Bump Version (dev)
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build:
+    name: Bump version
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        persist-credentials: false  # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
+        fetch-depth: 0              # otherwise, you will failed to push refs to dest repo
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Set env variables
+      run: |
+        # The next line is very important, otherwise the line after triggers
+        # git to track the permission change, which breaks bump2version API (needs clean git folder)
+        git config core.filemode false
+        chmod +x .github/workflows/utils.sh
+        echo "VERSION_FILE=openpnm/__version__.py" >> $GITHUB_ENV
+        echo "SETUP_CFG_FILE=setup.cfg" >> $GITHUB_ENV
+        echo "${{ github.event.head_commit.message }}"
+
+    - name: Install dependencies
+      run: |
+        pip install bump2version
+
+    - name: Bump version (build)
+      run: |
+        source .github/workflows/utils.sh
+        bump_version build $VERSION_FILE
+        # Note that we don't want to create a new tag for "builds"
+
+    - name: Commit files
+      run: |
+        REPOSITORY=${INPUT_REPOSITORY:-$GITHUB_REPOSITORY}
+        remote_repo="https://${GITHUB_ACTOR}:${{ secrets.PUSH_ACTION_TOKEN }}@github.com/${REPOSITORY}.git"
+
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+
+        # Commit version bump to dev ([no ci] to avoid infinite loop)
+        git commit -m "Bump version number [no ci]" -a
+        git push "${remote_repo}" dev

.github/workflows/bump-version.yml

@@ -1,4 +1,4 @@
-name: Bump Version Number
+name: Bump Version (release)
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8
 
     - name: Set env variables
       run: |
@@ -68,7 +68,7 @@ jobs:
         git config --local user.email "action@github.com"
         git config --local user.name "GitHub Action"
 
-        # commit version bump to release
+        # Commit version bump to release
         git commit -m "Bump version number" -a
         git push "${remote_repo}" release
 
@@ -85,6 +85,10 @@ jobs:
         pr_allow_empty: true                              # Creates pull request even if there are no changes
         github_token: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Trim the 4th digit from the tag
+      run:
+        echo "TAG_NEW=${TAG_NEW%.dev?}" >> $GITHUB_ENV
+
     - name: Create new tag
       run: |
         REPOSITORY=${INPUT_REPOSITORY:-$GITHUB_REPOSITORY}

.github/workflows/ci-macos.yml

@@ -1,6 +1,6 @@
 name: Clean Up Tags
 
-on: push
+on: [workflow_dispatch]
 
 jobs:
   deploy: