diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 46e572c..aef88e3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: stages: [pre-push] - id: django-test name: 'Checking Tests' - entry: python manage.py test + entry: pipenv run python manage.py test always_run: true pass_filenames: false language: system diff --git a/Pipfile.lock b/Pipfile.lock index 657727e..ca59dfe 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -50,20 +50,20 @@ }, "boto3": { "hashes": [ - "sha256:85e2fa361ad3210d30800bad311688261f2673a9b301e0edab56463d89609761", - "sha256:d18688bc5d688decf3cc404430a3ac3ec317be653cdcfbc51104c01f38a66434" + "sha256:1a47e5b8faea527bb2a40d0cf58faf0d09b5a46cf5658e2c5729479af20c96b8", + "sha256:c0899e54df362bea0ae329da59b0a00e4be5e220e99dc764802ed83cdfc4285c" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==1.28.76" + "version": "==1.28.77" }, "botocore": { "hashes": [ - "sha256:479abb5a1ee03eb00faa1ea176bc595b2f46f7494777807681a9df45ed99ea18", - "sha256:74e0a4515d61b2860b24dc208ca89a68d79dc00147125d531746d3ba808822ad" + "sha256:4c5c9562b5d1fb8355314ddf37142edf3f6abd7526f4a68cc1b6cd79bdda48ec", + "sha256:509168151f8a0e1b8296031a7fc7822d59d027865d3baa86917682b311a74d26" ], "markers": "python_version >= '3.7'", - "version": "==1.31.76" + "version": "==1.31.77" }, "celery": { "hashes": [ @@ -736,6 +736,17 @@ "sha256:e5d0d2b25931d88fa10986da59d941ac6037f742ab6ff2fce4143a27981d60c3" ], "version": "==1.34.0" +<<<<<<< HEAD + }, + "setuptools": { + "hashes": [ + "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87", + "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a" + ], + "markers": "python_version >= '3.8'", + "version": "==68.2.2" +======= +>>>>>>> staging }, "six": { "hashes": [ diff --git a/README.md b/README.md index 6d1169e..4f482b1 100644 --- a/README.md +++ b/README.md @@ -359,11 +359,18 @@ Below are the commands and expected outputs: ```bash pre-commit install -pre-commit installed at .git/hooks/pre-commit +``` +`pre-commit installed at .git/hooks/pre-commit` +```bash pre-commit install --hook-type commit-msg -pre-commit installed at .git/hooks/commit-msg ``` +`pre-commit installed at .git/hooks/commit-msg` + +```bash +pre-commit install --hook-type pre-push +``` +`pre-commit installed at .git/hooks/pre-push` To run the pre-commit checks before making a commit, run the following command. @@ -373,11 +380,9 @@ pre-commit run --all-files If no files need changes, the output should look like this: -```bash -isort....................................................................Passed -black....................................................................Passed -flake8...................................................................Passed -``` +`isort....................................................................Passed` +`black....................................................................Passed` +`flake8...................................................................Passed` If isort or black catch any errors, they will automatically alter the files to fix them. This will prevent making a commit, and you will need to stage the new changes.