From bd5cc8520729da7c3a24d33a4c269f2e09611824 Mon Sep 17 00:00:00 2001 From: James Braza Date: Fri, 17 Mar 2023 12:43:21 -0700 Subject: [PATCH 1/2] Added in default language and fixed spacing, removed comment --- .pre-commit-config.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 315f0d6f1..35965594a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,12 @@ -# See https://pre-commit.com for more information -# See https://pre-commit.com/hooks.html for more hooks +--- +default_language_version: + python: python + repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.2.0 hooks: - id: trailing-whitespace - # - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files - repo: https://github.com/pycqa/isort @@ -17,5 +18,5 @@ repos: rev: 22.12.0 hooks: - id: black - args: [--safe,--quiet] + args: [--safe, --quiet] files: (examples|pymodbus|test)/ From ab87bf4364a6e4f117c618afdb08b989a76f4655 Mon Sep 17 00:00:00 2001 From: James Braza Date: Fri, 17 Mar 2023 12:46:39 -0700 Subject: [PATCH 2/2] Added end-of-file-fixer and ran pre-commit on all files --- .github/workflows/stale.yml | 1 - .pre-commit-config.yaml | 1 + LICENSE | 1 - MANIFEST.in | 2 +- doc/changelog.rst | 2 +- doc/readme.rst | 2 +- pymodbus/client/serial_asyncio/README.md | 1 - 7 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f8d233527..7ca7449d3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -27,4 +27,3 @@ jobs: exempt-pr-labels: 'IN REVIEW,Reviewing,Draft,in progress,3.x,2.5.0' remove-stale-when-updated: true # only-labels: "More Information Required, Not an Issue, question, Won't Do" - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 35965594a..e295711e1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,6 +7,7 @@ repos: rev: v3.2.0 hooks: - id: trailing-whitespace + - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files - repo: https://github.com/pycqa/isort diff --git a/LICENSE b/LICENSE index 1a938446d..862459c66 100644 --- a/LICENSE +++ b/LICENSE @@ -22,4 +22,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/MANIFEST.in b/MANIFEST.in index 9e8f9ae0b..cc2c00f0c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include requirements.txt include README.rst include CHANGELOG.rst -include LICENSE \ No newline at end of file +include LICENSE diff --git a/doc/changelog.rst b/doc/changelog.rst index 5f879e1e5..1c8b69f1e 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -2,4 +2,4 @@ CHANGELOGS ============ -.. include:: ../CHANGELOG.rst \ No newline at end of file +.. include:: ../CHANGELOG.rst diff --git a/doc/readme.rst b/doc/readme.rst index 6b2b3ec68..72a335581 100644 --- a/doc/readme.rst +++ b/doc/readme.rst @@ -1 +1 @@ -.. include:: ../README.rst \ No newline at end of file +.. include:: ../README.rst diff --git a/pymodbus/client/serial_asyncio/README.md b/pymodbus/client/serial_asyncio/README.md index a521b632c..6c9ee80ff 100644 --- a/pymodbus/client/serial_asyncio/README.md +++ b/pymodbus/client/serial_asyncio/README.md @@ -1,4 +1,3 @@ Patch for serial_asyncio, also submitted to the repo: https://github.com/pyserial/pyserial-asyncio/pull/94 -