From 5f1e8479faa798a3a07cff5ad2c13bb11c3cb4b3 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 09:21:45 +0300 Subject: [PATCH 1/6] Lint trailing-whitespace --- .github/workflows/deploy-wheels.yml | 8 ++++---- .pre-commit-config.yaml | 2 ++ LICENSE.txt | 2 +- deps/double-conversion/README.md | 2 +- .../double-conversionConfigVersion.cmake.in | 2 +- lib/Makefile | 2 +- lib/dconv_wrapper.cc | 2 +- lib/ultrajson.h | 4 ++-- lib/ultrajsondec.c | 4 ++-- lib/ultrajsonenc.c | 4 ++-- python/JSONtoObj.c | 4 ++-- python/objToJSON.c | 4 ++-- python/ujson.c | 4 ++-- python/version_template.h | 4 ++-- scripts/build-manylinux-wheels.sh | 2 +- 15 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/deploy-wheels.yml b/.github/workflows/deploy-wheels.yml index b10938c..2a99470 100644 --- a/.github/workflows/deploy-wheels.yml +++ b/.github/workflows/deploy-wheels.yml @@ -18,8 +18,8 @@ jobs: fail-fast: false matrix: os: [windows-latest, macOS-latest] - python-version: [3.5, 3.6, 3.7, 3.8] - include: + python-version: [3.5, 3.6, 3.7, 3.8] + include: - os: ubuntu-latest python-version: 3.8 @@ -50,7 +50,7 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | 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_i686 -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/scripts/build-manylinux-wheels.sh + docker run -e PLAT=manylinux1_i686 -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/scripts/build-manylinux-wheels.sh - uses: actions/upload-artifact@v2 with: @@ -59,7 +59,7 @@ jobs: - name: Publish package to PyPI if: github.event.action == 'published' - env: + env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.pypi_password }} run: twine upload --skip-existing dist/*.whl diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8a225f..4fc298d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,3 +39,5 @@ repos: - id: check-merge-conflict - id: check-toml - id: check-yaml + - id: trailing-whitespace + exclude: "^.github/.*_TEMPLATE.md" diff --git a/LICENSE.txt b/LICENSE.txt index c73397f..bab80a6 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -16,7 +16,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/deps/double-conversion/README.md b/deps/double-conversion/README.md index 4ae9be5..1660179 100644 --- a/deps/double-conversion/README.md +++ b/deps/double-conversion/README.md @@ -7,7 +7,7 @@ The library consists of efficient conversion routines that have been extracted from the V8 JavaScript engine. The code has been refactored and improved so that it can be used more easily in other projects. -There is extensive documentation in `double-conversion/double-conversion.h`. Other +There is extensive documentation in `double-conversion/double-conversion.h`. Other examples can be found in `test/cctest/test-conversions.cc`. diff --git a/deps/double-conversion/double-conversionConfigVersion.cmake.in b/deps/double-conversion/double-conversionConfigVersion.cmake.in index 0f2295d..fc6254e 100644 --- a/deps/double-conversion/double-conversionConfigVersion.cmake.in +++ b/deps/double-conversion/double-conversionConfigVersion.cmake.in @@ -1,5 +1,5 @@ set(PACKAGE_VERSION "@double-conversion_VERSION@") - + # Check whether the requested PACKAGE_FIND_VERSION is compatible if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") set(PACKAGE_VERSION_COMPATIBLE FALSE) diff --git a/lib/Makefile b/lib/Makefile index 9924d94..8243c55 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -3,7 +3,7 @@ CPP=gcc LIBS=-lm SOURCE=. OBJS=ultrajsonenc.o ultrajsondec.o -LINKFLAGS=-shared +LINKFLAGS=-shared #-Wl,-soname,libultrajson.so.1 CPPFLAGS=-D_REENTRANT -D_LINUX diff --git a/lib/dconv_wrapper.cc b/lib/dconv_wrapper.cc index 27e1b9b..2b38f6d 100644 --- a/lib/dconv_wrapper.cc +++ b/lib/dconv_wrapper.cc @@ -36,7 +36,7 @@ namespace double_conversion d2s_instance = NULL; } - void dconv_s2d_init(int flags, double empty_string_value, + void dconv_s2d_init(int flags, double empty_string_value, double junk_string_value, const char* infinity_symbol, const char* nan_symbol) { diff --git a/lib/ultrajson.h b/lib/ultrajson.h index 112606c..79abf1d 100644 --- a/lib/ultrajson.h +++ b/lib/ultrajson.h @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/lib/ultrajsondec.c b/lib/ultrajsondec.c index 736b2b7..ec73326 100644 --- a/lib/ultrajsondec.c +++ b/lib/ultrajsondec.c @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c index 0a8b64e..097e887 100644 --- a/lib/ultrajsonenc.c +++ b/lib/ultrajsonenc.c @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/python/JSONtoObj.c b/python/JSONtoObj.c index cf8a3bc..0f23e92 100644 --- a/python/JSONtoObj.c +++ b/python/JSONtoObj.c @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/python/objToJSON.c b/python/objToJSON.c index 95bb0bd..1f3dfbd 100644 --- a/python/objToJSON.c +++ b/python/objToJSON.c @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/python/ujson.c b/python/ujson.c index dffb6cf..f7dcc28 100644 --- a/python/ujson.c +++ b/python/ujson.c @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/python/version_template.h b/python/version_template.h index 5eb59be..8aad574 100644 --- a/python/version_template.h +++ b/python/version_template.h @@ -1,5 +1,5 @@ /* -Developed by ESN, an Electronic Arts Inc. studio. +Developed by ESN, an Electronic Arts Inc. studio. Copyright (c) 2014, Electronic Arts Inc. All rights reserved. @@ -17,7 +17,7 @@ derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE +DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/scripts/build-manylinux-wheels.sh b/scripts/build-manylinux-wheels.sh index 6850127..a490a68 100755 --- a/scripts/build-manylinux-wheels.sh +++ b/scripts/build-manylinux-wheels.sh @@ -27,7 +27,7 @@ done "$PYBIN/pip" install -q auditwheel -# Wheels aren't considered manylinux unless they have been through +# Wheels aren't considered manylinux unless they have been through # auditwheel. Audited wheels go in /io/dist/. mkdir -p /io/dist/ From 4ae63bee5ca9db4dd847833a376981a3c5434a0b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 09:36:47 +0300 Subject: [PATCH 2/6] Lint end-of-file-fixer --- .github/workflows/deploy-wheels.yml | 1 - .pre-commit-config.yaml | 1 + LICENSE.txt | 2 +- deps/double-conversion/msvc/double-conversion.vcxproj | 2 +- deps/double-conversion/msvc/double-conversion.vcxproj.filters | 2 +- deps/double-conversion/msvc/run_tests/run_tests.vcxproj | 2 +- deps/double-conversion/msvc/run_tests/run_tests.vcxproj.filters | 2 +- deps/double-conversion/test/CMakeLists.txt | 2 +- lib/Makefile | 1 - scripts/build-manylinux-wheels.sh | 1 - tests/sample.json | 2 +- 11 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-wheels.yml b/.github/workflows/deploy-wheels.yml index 2a99470..e0de592 100644 --- a/.github/workflows/deploy-wheels.yml +++ b/.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 - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4fc298d..a649760 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,5 +39,6 @@ repos: - id: check-merge-conflict - id: check-toml - id: check-yaml + - id: end-of-file-fixer - id: trailing-whitespace exclude: "^.github/.*_TEMPLATE.md" diff --git a/LICENSE.txt b/LICENSE.txt index bab80a6..64fa634 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -32,4 +32,4 @@ Copyright (c) 2007 Nick Galbreath -- nickg [at] modp [dot] com. All rights rese Numeric decoder derived from from TCL library https://opensource.apple.com/source/tcl/tcl-14/tcl/license.terms * Copyright (c) 1988-1993 The Regents of the University of California. - * Copyright (c) 1994 Sun Microsystems, Inc. \ No newline at end of file + * Copyright (c) 1994 Sun Microsystems, Inc. diff --git a/deps/double-conversion/msvc/double-conversion.vcxproj b/deps/double-conversion/msvc/double-conversion.vcxproj index 5616c8a..06c0a63 100644 --- a/deps/double-conversion/msvc/double-conversion.vcxproj +++ b/deps/double-conversion/msvc/double-conversion.vcxproj @@ -171,4 +171,4 @@ - \ No newline at end of file + diff --git a/deps/double-conversion/msvc/double-conversion.vcxproj.filters b/deps/double-conversion/msvc/double-conversion.vcxproj.filters index 664a27f..fe58a68 100644 --- a/deps/double-conversion/msvc/double-conversion.vcxproj.filters +++ b/deps/double-conversion/msvc/double-conversion.vcxproj.filters @@ -72,4 +72,4 @@ Header Files - \ No newline at end of file + diff --git a/deps/double-conversion/msvc/run_tests/run_tests.vcxproj b/deps/double-conversion/msvc/run_tests/run_tests.vcxproj index 05d2873..e2731d7 100644 --- a/deps/double-conversion/msvc/run_tests/run_tests.vcxproj +++ b/deps/double-conversion/msvc/run_tests/run_tests.vcxproj @@ -183,4 +183,4 @@ - \ No newline at end of file + diff --git a/deps/double-conversion/msvc/run_tests/run_tests.vcxproj.filters b/deps/double-conversion/msvc/run_tests/run_tests.vcxproj.filters index e923c7d..314dd26 100644 --- a/deps/double-conversion/msvc/run_tests/run_tests.vcxproj.filters +++ b/deps/double-conversion/msvc/run_tests/run_tests.vcxproj.filters @@ -78,4 +78,4 @@ Header Files - \ No newline at end of file + diff --git a/deps/double-conversion/test/CMakeLists.txt b/deps/double-conversion/test/CMakeLists.txt index 3cf4449..9d7a646 100644 --- a/deps/double-conversion/test/CMakeLists.txt +++ b/deps/double-conversion/test/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(cctest) \ No newline at end of file +add_subdirectory(cctest) diff --git a/lib/Makefile b/lib/Makefile index 8243c55..5cb09cf 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -20,4 +20,3 @@ libultrajson : $(OBJS) clean: rm -rf *.o rm -rf $(PROGRAM) - diff --git a/scripts/build-manylinux-wheels.sh b/scripts/build-manylinux-wheels.sh index a490a68..6e66a39 100755 --- a/scripts/build-manylinux-wheels.sh +++ b/scripts/build-manylinux-wheels.sh @@ -34,4 +34,3 @@ mkdir -p /io/dist/ for whl in /io/temp-wheels/*.whl; do auditwheel repair "$whl" --plat $PLAT -w /io/dist/ done - diff --git a/tests/sample.json b/tests/sample.json index 30930e7..c53d712 100644 --- a/tests/sample.json +++ b/tests/sample.json @@ -3312,4 +3312,4 @@ "obj": {"key": "wrong value"}, "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null } -} \ No newline at end of file +} From e3a883dfd3f7333e176819bbff7d189edb64bf5f Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 09:38:10 +0300 Subject: [PATCH 3/6] Lint check-json --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a649760..43de122 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,6 +37,7 @@ repos: rev: v2.5.0 hooks: - id: check-merge-conflict + - id: check-json - id: check-toml - id: check-yaml - id: end-of-file-fixer From 6497e1a66d2870dfa2425500d7a099945e65e034 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 09:39:56 +0300 Subject: [PATCH 4/6] pre-commit autoupdate --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 43de122..94e773c 100644 --- a/.pre-commit-config.yaml +++ b/.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 From dc5ed402f0b782f3bdfa3c8376d6008bcbfeb38b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 10:41:32 +0300 Subject: [PATCH 5/6] Fix typos, add newlines for readability --- scripts/build-manylinux-wheels.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/build-manylinux-wheels.sh b/scripts/build-manylinux-wheels.sh index 6e66a39..992a418 100755 --- a/scripts/build-manylinux-wheels.sh +++ b/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. From 2533b9731e8abb9cb580d53c09c6ffe04961f780 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 12 May 2020 10:47:58 +0300 Subject: [PATCH 6/6] Ignore temp dirs created by the Docker wheel build --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 32ca83c..b755726 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,7 @@ dmypy.json # Generated by setuptools_scm python/version.h + +# Docker wheel build +pip-cache/ +temp-wheels/