Merge pull request #422 from henryiii/ci/format

ci: format updates

.circleci/config.yml

@@ -1,22 +1,6 @@
 version: 2
 
 jobs:
-  flake8-mypy:
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      - checkout
-
-      - run:
-          name: Install flake8 & mypy
-          command: sudo python -m pip install flake8 mypy
-      - run:
-          name: flake8
-          command: flake8
-      - run:
-          name: mypy
-          command: mypy
-
   osx-python3.6:
     macos:
       xcode: "9.4.1"
@@ -54,6 +38,5 @@ workflows:
   version: 2
   all-tests:
     jobs:
-      - flake8-mypy
       - osx-python3.6
       - linux-python3.6

.github/workflows/test.yml

@@ -7,6 +7,14 @@ on:
       - 'docs/**'
 
 jobs:
+  pre-commit:
+    name: Pre-commit checks (mypy, flake8, etc.)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - uses: pre-commit/action@v2.0.0
+
   test:
     # skip branch builds on joerick/cibuildwheel, but always build `master` and pull requests
     if: github.repository != 'joerick/cibuildwheel' || github.ref == 'refs/heads/master' || github.event_name == 'pull_request'

.pre-commit-config.yaml

@@ -1,21 +1,25 @@
 repos:
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
-    hooks:
-    - id: flake8
-      pass_filenames: true
-      # this seems to need to be here in addition to setup.cfg
-      exclude: cibuildwheel/resources/
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
-    hooks:
-    - id: check-yaml
-    - id: check-merge-conflict
-    - id: end-of-file-fixer
-      exclude: cibuildwheel/resources/pinned_docker_images.cfg
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: ''  # Use the sha / tag you want to point at
-    hooks:
-    - id: mypy
-      files: cibuildwheel|test
-      exclude: cibuildwheel/resources
+- repo: https://gitlab.com/pycqa/flake8
+  rev: 3.8.3
+  hooks:
+  - id: flake8
+    exclude: cibuildwheel/resources/
+    additional_dependencies: [flake8-bugbear]
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  - id: check-case-conflict
+  - id: check-merge-conflict
+  - id: check-yaml
+  - id: end-of-file-fixer
+    exclude: cibuildwheel/resources/pinned_docker_images.cfg
+  - id: mixed-line-ending
+  - id: trailing-whitespace
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v0.782
+  hooks:
+  - id: mypy
+    files: cibuildwheel/|test/
+    pass_filenames: false

cibuildwheel/docker_container.py

@@ -117,11 +117,12 @@ class DockerContainer:
 
         return [PurePath(p) for p in path_strs]
 
-    def call(self, args: Sequence[Union[str, PathLike]], env: Dict[str, str] = {},
+    def call(self, args: Sequence[Union[str, PathLike]], env: Optional[Dict[str, str]] = None,
              capture_output=False, cwd: Optional[Union[str, PathLike]] = None) -> str:
+
         chdir = f'cd {cwd}' if cwd else ''
         env_assignments = ' '.join(f'{shlex.quote(k)}={shlex.quote(v)}'
-                                   for k, v in env.items())
+                                   for k, v in env.items()) if env is not None else ''
         command = ' '.join(shlex.quote(str(a)) for a in args)
         end_of_message = str(uuid.uuid4())
 

setup.cfg

@@ -1,5 +1,6 @@
 [flake8]
-ignore = E501,W503,E741,E226
+ignore = E501,W503,E741,E226,B950
+select = C,E,F,W,B,B9
 application-import-names = cibuildwheel
 exclude =
   cibuildwheel/resources/,