merge from branch

Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>

.github/workflows/ci.yml → .github/workflows/build.yml

@@ -9,8 +9,8 @@
 # To skip certain builds see:
 # https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip
 
-name: CI
 on: [push]
+name: Build
 jobs:
   linux-macos-win:
     name: ${{ matrix.os }}
@@ -25,10 +25,8 @@ jobs:
           - {name: Linux, python: '3.9', os: ubuntu-latest}
     env:
       CIBW_TEST_COMMAND:
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_TESTING=1 PSUTIL_DEBUG=1
-        python {project}/psutil/tests/runner.py &&
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_TESTING=1 PSUTIL_DEBUG=1
-        python {project}/psutil/tests/test_memleaks.py
+        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_TESTING=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py &&
+        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_TESTING=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py
       CIBW_TEST_EXTRAS: test
       CIBW_SKIP: cp35-* pp*
     steps:
@@ -51,7 +49,6 @@ jobs:
       run: |
         pip install cibuildwheel
         cibuildwheel .
-
     - name: Create wheels
       uses: actions/upload-artifact@v2
       with:
@@ -86,10 +83,22 @@ jobs:
           set +e
           export \
             PYTHONWARNINGS=always \
-            PYTHONUNBUFFERED=1 \
             PSUTIL_TESTING=1 \
             PSUTIL_DEBUG=1
           python3 -m pip install --user setuptools
           python3 setup.py install
           python3 psutil/tests/runner.py
           python3 psutil/tests/test_memleaks.py
+
+  linters:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - name: 'Linters'
+      run: |
+        python -m pip install flake8
+        python -m flake8 .
+        echo "flake8 linting OK"
+        find . -type f \( -iname "*.c" -o -iname "*.h" \) | xargs python scripts/internal/clinter.py
+        echo "C linting OK"

appveyor.yml

@@ -99,7 +99,7 @@ cache:
 #   - might want to upload the content of dist/*.whl to a public wheelhouse
 
 skip_commits:
-  message: skip-ci
+  message: skip-appveyor
 
 # run build only if one of the following files is modified on commit
 only_commits: