mirror of
https://github.com/ultrajson/ultrajson.git
synced 2024-06-19 06:19:01 +02:00
Merge pull request #408 from hugovk/lint
This commit is contained in:
commit
cae2cb49b4
|
@ -71,4 +71,3 @@ jobs:
|
||||||
TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
|
TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
|
||||||
run: |
|
run: |
|
||||||
twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl
|
twine upload --repository-url https://test.pypi.org/legacy/ --skip-existing dist/*.whl
|
||||||
|
|
||||||
|
|
|
@ -137,3 +137,7 @@ dmypy.json
|
||||||
|
|
||||||
# Generated by setuptools_scm
|
# Generated by setuptools_scm
|
||||||
python/version.h
|
python/version.h
|
||||||
|
|
||||||
|
# Docker wheel build
|
||||||
|
pip-cache/
|
||||||
|
temp-wheels/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
- repo: https://github.com/asottile/pyupgrade
|
||||||
rev: v2.1.0
|
rev: v2.4.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyupgrade
|
- id: pyupgrade
|
||||||
args: ["--py3-plus"]
|
args: ["--py3-plus"]
|
||||||
|
@ -12,13 +12,13 @@ repos:
|
||||||
args: ["--target-version", "py35"]
|
args: ["--target-version", "py35"]
|
||||||
|
|
||||||
- repo: https://gitlab.com/pycqa/flake8
|
- repo: https://gitlab.com/pycqa/flake8
|
||||||
rev: 3.7.9
|
rev: 3.8.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: flake8
|
- id: flake8
|
||||||
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
|
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
|
||||||
|
|
||||||
- repo: https://github.com/asottile/seed-isort-config
|
- repo: https://github.com/asottile/seed-isort-config
|
||||||
rev: v2.1.0
|
rev: v2.1.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: seed-isort-config
|
- id: seed-isort-config
|
||||||
|
|
||||||
|
@ -37,5 +37,9 @@ repos:
|
||||||
rev: v2.5.0
|
rev: v2.5.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
|
- id: check-json
|
||||||
- id: check-toml
|
- id: check-toml
|
||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
|
- id: end-of-file-fixer
|
||||||
|
- id: trailing-whitespace
|
||||||
|
exclude: "^.github/.*_TEMPLATE.md"
|
||||||
|
|
|
@ -20,4 +20,3 @@ libultrajson : $(OBJS)
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o
|
rm -rf *.o
|
||||||
rm -rf $(PROGRAM)
|
rm -rf $(PROGRAM)
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,20 @@
|
||||||
set -e -x
|
set -e -x
|
||||||
|
|
||||||
# This is to be run by Docker inside a Docker image.
|
# 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
|
# $ 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 -e just defines an environment variable PLAT=[docker name] inside the Docker:
|
||||||
# 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
|
# auditwheel can't detect the Docker name automatically.
|
||||||
# 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 -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.
|
# 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.
|
# 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
|
for whl in /io/temp-wheels/*.whl; do
|
||||||
auditwheel repair "$whl" --plat $PLAT -w /io/dist/
|
auditwheel repair "$whl" --plat $PLAT -w /io/dist/
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue