Merge pull request #5 from tmarktaylor/develop

Merge develop to main for next version.
tmarktaylor · Sep 15, 2023 · 2935e2b · 2935e2b
2 parents aa9c9e2 + 472ff3d
commit 2935e2b
Show file tree

Hide file tree

Showing 127 changed files with 1,561 additions and 902 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,8 +18,10 @@ jobs:
     - name: Build dist
       run: |
         python -m pip install build --user
+        python -m pip install twine --user
         python -m build
         python -m pip hash dist/*
+        twine check dist/*
 
     - name: Upload dist
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,9 @@ jobs:
       run: |
         pytest -vv tests
 
+
   versions:
+    needs: os
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -78,48 +80,13 @@ jobs:
           phmutest docs/advanced/skipif.md --log
           phmutest docs/advanced/label.md --log
           phmutest docs/advanced/labelanyfcb.md --log
+          phmutest tests/md/optionflags.md --log --replmode --fixture tests.test_patching.setflags
+          phmutest docs/fix/code/globdemo.md --fixture docs.fix.code.globdemo.init_globals --log
           phmutest tests/md/project.md --report
 
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.x
-      id: setuppython
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
-    - name: Install phmutest
-      run: |
-        python -m pip install --upgrade pip
-        pip install coverage
-        pip install -r tests/requirements.txt
-        pip freeze
-    - name: Tests, coverage report
-      run: |
-        coverage erase
-        coverage run --branch --source=src -m phmutest --version
-        coverage run --branch --source=src --append -m phmutest README.md --report
-        coverage run --branch --source=src --append -m phmutest README.md
-        coverage run --branch --source=src --append -m pytest -vv tests
-        coverage report --show-missing
-        coverage xml
-      env:
-        PYTHONPATH: ${{ github.workspace }}/src
-      continue-on-error: true
-
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ./coverage.xml # optional
-        flags: pytest,python-${{ steps.setuppython.outputs.python-version }},ubuntu-latest # optional
-        name: codecov-umbrella # optional
-        fail_ci_if_error: false # optional (default = false)
-        verbose: true # optional (default = false)
-
 
   inspect:
+    needs: versions
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -144,8 +111,8 @@ jobs:
       # Subsequent steps run with the modified files.
       # Don't run black on the generated test files.
       run: |
-        black **/*.py --check --force-exclude "tests.py.generated.*py"
-        black **/*.py --force-exclude "tests.py.generated.*py"
+        black **/*.py --check --force-exclude="tests/py"
+        black **/*.py --force-exclude="tests/py"
       continue-on-error: true
     - name: Code Style
       run: |
@@ -158,8 +125,6 @@ jobs:
     - name: Deployable
       run: |
         python tests/check_classifiers.py
-        python setup.py sdist
-        twine check dist/*
     - name: Docs
       run: |
         python docs/premkdocs.py
@@ -170,3 +135,43 @@ jobs:
         name: site
         path: site
         retention-days: 5
+
+
+  coverage:
+    needs: inspect
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.x
+      id: setuppython
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: Install phmutest
+      run: |
+        python -m pip install --upgrade pip
+        pip install coverage
+        pip install -r tests/requirements.txt
+        pip freeze
+    - name: Tests, coverage report
+      run: |
+        coverage erase
+        coverage run --branch --source=src -m phmutest --version
+        coverage run --branch --source=src --append -m phmutest README.md --report
+        coverage run --branch --source=src --append -m phmutest README.md
+        coverage run --branch --source=src --append -m pytest -vv tests
+        coverage report --show-missing
+        coverage xml
+      env:
+        PYTHONPATH: ${{ github.workspace }}/src
+      continue-on-error: true
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.xml # optional
+        flags: pytest,python-${{ steps.setuppython.outputs.python-version }},ubuntu-latest # optional
+        name: codecov-umbrella # optional
+        fail_ci_if_error: false # optional (default = false)
+        verbose: true # optional (default = false)
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  ref: v0.0.1
+  ref: v0.0.2
 
 jobs:
   builddist:

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 env:
-  version: 0.0.1
+  project: phmutest
+  version: 0.0.2
   command: phmutest
 
 jobs:

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 # PyCharm
 .idea/
 
+# IDE
+.vscode/
+
 # Mkdocs
 site
 _mkdocsin