From 68ed6f0eb67f8688d1f2da1240d0bec8dec8b264 Mon Sep 17 00:00:00 2001 From: James Stevenson Date: Wed, 7 Aug 2024 09:45:03 -0400 Subject: [PATCH] cicd: update precommit --- .pre-commit-config.yaml | 31 +++++++++++++++++-------------- pyproject.toml | 8 +++++++- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4b6b29c..0ea2558 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,15 +1,18 @@ repos: -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v1.4.0 - hooks: - - id: check-added-large-files - args: ['--maxkb=1500'] - - id: detect-private-key - - id: trailing-whitespace - - id: end-of-file-fixer -- repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.0 # ruff version - hooks: - - id: ruff-format - - id: ruff - args: [ --fix, --exit-non-zero-on-fix ] + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 # pre-commit-hooks version + hooks: + - id: check-added-large-files + - id: detect-private-key + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-merge-conflict + - id: detect-aws-credentials + args: [ --allow-missing-credentials ] + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.5.0 # ruff version + hooks: + - id: ruff-format + - id: ruff + args: [ --fix, --exit-non-zero-on-fix ] +minimum_pre_commit_version: 3.7.1 diff --git a/pyproject.toml b/pyproject.toml index 7b914f5..f77cf6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,4 @@ -[project] +[>=3.7.1project] name = "wags_tails" version = "0.1.3" authors = [ @@ -30,7 +30,13 @@ dependencies = [ [project.optional-dependencies] test = ["pytest>=6.0", "pytest-cov", "requests-mock"] +<<<<<<< Updated upstream dev = ["pre-commit", "ruff==0.5.0"] +||||||| Stash base +dev = ["pre-commit", "ruff==0.2.0"] +======= +dev = ["pre-commit>=3.7.1", "ruff==0.2.0"] +>>>>>>> Stashed changes docs = [ "sphinx==6.1.3", "sphinx-autodoc-typehints==1.22.0",