Merge pull request #408 from hugovk/lint

.github/workflows/deploy-wheels.yml

@@ -71,4 +71,3 @@ jobs:
         TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
       run: |
         twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl
-

.gitignore

@@ -137,3 +137,7 @@ dmypy.json
 
 # Generated by setuptools_scm
 python/version.h
+
+# Docker wheel build
+pip-cache/
+temp-wheels/

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.1.0
+    rev: v2.4.1
     hooks:
       - id: pyupgrade
         args: ["--py3-plus"]
@@ -12,13 +12,13 @@ repos:
         args: ["--target-version", "py35"]
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.8.1
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
 
   - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.1.0
+    rev: v2.1.1
     hooks:
       - id: seed-isort-config
 
@@ -37,5 +37,9 @@ repos:
     rev: v2.5.0
     hooks:
       - id: check-merge-conflict
+      - id: check-json
       - id: check-toml
       - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+        exclude: "^.github/.*_TEMPLATE.md"

lib/Makefile

@@ -20,4 +20,3 @@ libultrajson : $(OBJS)
 clean:
 	rm -rf *.o
 	rm -rf $(PROGRAM)
-

scripts/build-manylinux-wheels.sh

@@ -2,13 +2,20 @@
 set -e -x
 
 # This is to be run by Docker inside a Docker image.
-# You can test it locally on a Linux machine by installing docker and running from this repo's root:
+# You can test it locally on a Linux machine by installing Docker and running from this
+# repo's root:
 # $ docker run -e PLAT=manylinux1_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
 
-# The -e just defines an evironment variable PLAT=[docker name] inside the docker - auditwheel can't detect the docker name automatically.
-# The -v gives a directory alias for passing files in and out of the docker. (/io is arbitrary). E.g the setup.py script can be accessed in the docker via /io/setup.py
-# quay.io/pypa/manylinux1_x86_64 is the full docker image name. Docker downloads it automatically.
-# The last argument is a shell command that the Docker will execute. Filenames must be from the Docker's perspective.
+# The -e just defines an environment variable PLAT=[docker name] inside the Docker:
+# auditwheel can't detect the Docker name automatically.
+
+# The -v gives a directory alias for passing files in and out of the Docker.
+# (/io is arbitrary). E.g the setup.py script can be accessed in the Docker via
+# /io/setup.py quay.io/pypa/manylinux1_x86_64 is the full Docker image name. Docker
+# downloads it automatically.
+
+# The last argument is a shell command that the Docker will execute. Filenames must be
+# from the Docker's perspective.
 
 # Wheels are initially generated as you would usually, but put in a temp directory temp-wheels.
 # The pip-cache is optional but can speed up local builds having a real permanent pip-cache dir.
@@ -34,4 +41,3 @@ mkdir -p /io/dist/
 for whl in /io/temp-wheels/*.whl; do
     auditwheel repair "$whl" --plat $PLAT -w /io/dist/
 done
-