Activate color output on GHA, re-add Pytest config for 2.7

bittner · Mar 25, 2022 · 6bc445a · 6bc445a
1 parent 6ea96f2
commit 6bc445a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -8,6 +8,9 @@ on:
     branches:
     - main
 
+env:
+  PY_COLORS: "1"
+
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -24,7 +27,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.9'
     - name: Install build tools
       run: |
         python -m pip install --upgrade pip

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,18 +1,21 @@
-name: Publish Python package
+name: Publish
 
 on:
   push:
     tags:
     - "*"
 
+env:
+  PY_COLORS: "1"
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.9'
     - name: Install build tools
       run: |
         python -m pip install --upgrade pip

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,6 +8,9 @@ on:
     branches:
     - main
 
+env:
+  PY_COLORS: "1"
+
 jobs:
   test:
     runs-on: ${{ matrix.platform }}

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,4 +20,4 @@ ignore = ["py2clean.py","py3clean.py","pypyclean.py"]
 output-format = "colorized"
 
 [tool.pytest.ini_options]
-addopts = "--doctest-modules --ignore=pyclean/py2clean.py --ignore=pyclean/py3clean.py --ignore=pyclean/pypyclean.py --junitxml=tests/unittests-report.xml --color=yes --verbose"
+addopts = "--color=yes --doctest-modules --ignore=pyclean/py2clean.py --ignore=pyclean/py3clean.py --ignore=pyclean/pypyclean.py --junitxml=tests/unittests-report.xml --verbose"
diff --git a/tox.ini b/tox.ini
@@ -96,3 +96,13 @@ exclude = .tox,build,dist,pyclean.egg-info
 per-file-ignores =
     pyclean/py2clean.py:E402
     pyclean/py3clean.py:E402
+
+[pytest]
+addopts =
+    --color=yes
+    --doctest-modules
+    --ignore=pyclean/py2clean.py
+    --ignore=pyclean/py3clean.py
+    --ignore=pyclean/pypyclean.py
+    --junitxml=tests/unittests-report.xml
+    --verbose
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,9 @@ on: @@
         branches:
         - main
+    env:
+      PY_COLORS: "1"
     jobs:
       test:
         runs-on: ${{ matrix.platform }}
@@ Expand Down @@