Merge pull request conda-forge#1573 from xhochy/use-pre-commit-in-ci

Run pre-commit hooks in CI

.github/auto-merge.yaml

@@ -2,6 +2,6 @@ reportStatus: true
 
 minApprovals:
   COLLABORATOR: 0
-  
+
 requiredLabels:
   - automerge

.github/workflows/tests.yml

@@ -23,16 +23,20 @@ jobs:
       - name: install code and deps
         shell: bash -l {0}
         run: |
-          conda install --file requirements.txt black coverage coveralls mock pytest pytest-cov pip ${CONDA_PKGS} --yes --quiet
+          conda install --file requirements.txt pre-commit coverage coveralls mock pytest pytest-cov pip ${CONDA_PKGS} --yes --quiet
           python -m pip install -e .
           git config --global user.email "smithy@smithy.smithy"
           git config --global user.name "smithy"
 
+      - name: run pre-commit hooks
+        shell: bash -l {0}
+        run: |
+          pre-commit run -a
+
       - name: run tests
         shell: bash -l {0}
         run: |
           pytest tests --cov conda_smithy
-          black --check --verbose --diff --config=pyproject.toml .
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.pre-commit-config.yaml

@@ -3,6 +3,7 @@ repos:
     rev: v4.0.1
     hooks:
     -   id: check-yaml
+        exclude: (tests/recipes|conda_smithy.recipe)
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black

extract_licenses.bash

@@ -4,4 +4,3 @@
 # Capture first table
 # Extract code entries from table
 wget -q -O - https://spdx.org/licenses/ |  sed '/<table/,/<\/table>/!d;/<\/table>/q' | awk -- 'BEGIN{FS=">";RS="</code"};/<code/{print $NF}'
-

pytest.ini

@@ -3,4 +3,4 @@ markers =
     legacy_circle: Test designed to run as if prior to the azure migration
     legacy_travis: Test designed to run as if prior to the azure migration
     legacy_appveyor: Test designed to run as if prior to the azure migration
-    cli: CLI tests outside of test/test_cli.py
+    cli: CLI tests outside of test/test_cli.py

tests/recipes/click-test-feedstock/.appveyor.yml

@@ -4,13 +4,13 @@
 
 environment:
 
-  
+
 
   matrix:
     - CONFIG: python2.7
-  
+
     - CONFIG: python3.6
-  
+
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable.

tests/recipes/click-test-feedstock/.ci_support/README

@@ -1 +1 @@
-This file is automatically generated by conda-smithy.  To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly.
+This file is automatically generated by conda-smithy.  To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly.

tests/recipes/click-test-feedstock/.travis.yml

@@ -8,7 +8,7 @@ osx_image: xcode6.4
 
 env:
   matrix:
-    
+
     - CONFIG=python2.7
     - CONFIG=python3.6
 

tests/recipes/click-test-feedstock/README.md

@@ -111,4 +111,3 @@ In order to produce a uniquely identifiable distribution:
 
    the [``build/number``](https://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
    back to 0.
-

tests/recipes/click-test-feedstock/recipe/run_conda_forge_build_setup_linux

@@ -1 +1 @@
-echo "dummy linux setup script"
+echo "dummy linux setup script"

tests/recipes/click-test-feedstock/recipe/run_conda_forge_build_setup_osx

@@ -1 +1 @@
-echo "dummy osx setup script"
+echo "dummy osx setup script"

tests/recipes/click-test-feedstock/recipe/run_conda_forge_build_setup_win.bat

@@ -1 +1 @@
-echo "dummy win setup script"
+echo "dummy win setup script"