From 12017b27af5e87bdb366515f9d94e3f70896f202 Mon Sep 17 00:00:00 2001 From: gaurovgiri Date: Thu, 10 Oct 2024 13:56:37 +0545 Subject: [PATCH 1/3] fix: make pre_commit installable via test-requirements.txt --- test-requirements.in | 1 + test-requirements.txt | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/test-requirements.in b/test-requirements.in index 5a888811bfcd..6e30ddc9e1b6 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -15,3 +15,4 @@ pytest-cov>=2.10.0 ruff==0.2.0 # must match version in .pre-commit-config.yaml setuptools>=65.5.1 tomli>=1.1.0 # needed even on py311+ so the self check passes with --python-version 3.8 +pre_commit==4.0.1 diff --git a/test-requirements.txt b/test-requirements.txt index f4fb4a20cce7..fbe7f4570e6b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,22 +8,30 @@ attrs==23.1.0 # via -r test-requirements.in black==24.3.0 # via -r test-requirements.in +cfgv==3.4.0 + # via pre-commit click==8.1.7 # via black coverage==7.3.2 # via pytest-cov +distlib==0.3.9 + # via virtualenv execnet==2.0.2 # via pytest-xdist filelock==3.12.4 - # via -r test-requirements.in + # via + # -r test-requirements.in + # virtualenv +identify==2.6.1 + # via pre-commit iniconfig==2.0.0 # via pytest -lxml==4.9.2 ; (python_version < "3.11" or sys_platform != "win32") and python_version < "3.12" - # via -r test-requirements.in mypy-extensions==1.0.0 # via # -r mypy-requirements.txt # black +nodeenv==1.9.1 + # via pre-commit packaging==23.2 # via # black @@ -31,9 +39,13 @@ packaging==23.2 pathspec==0.11.2 # via black platformdirs==3.11.0 - # via black + # via + # black + # virtualenv pluggy==1.4.0 # via pytest +pre-commit==4.0.1 + # via -r test-requirements.in psutil==5.9.6 # via -r test-requirements.in pytest==8.1.1 @@ -45,6 +57,8 @@ pytest-cov==4.1.0 # via -r test-requirements.in pytest-xdist==3.3.1 # via -r test-requirements.in +pyyaml==6.0.2 + # via pre-commit ruff==0.2.0 # via -r test-requirements.in tomli==2.0.1 @@ -55,6 +69,8 @@ types-setuptools==68.2.0.0 # via -r build-requirements.txt typing-extensions==4.12.2 # via -r mypy-requirements.txt +virtualenv==20.26.6 + # via pre-commit # The following packages are considered to be unsafe in a requirements file: setuptools==70.0.0 From 5d20a11f3405dc0414592c8db6dbfc79b46d6ae9 Mon Sep 17 00:00:00 2001 From: gaurovgiri Date: Thu, 10 Oct 2024 14:15:51 +0545 Subject: [PATCH 2/3] chore: add working version for pre_commit --- test-requirements.in | 2 +- test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.in b/test-requirements.in index 6e30ddc9e1b6..fcc478cb3b14 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -15,4 +15,4 @@ pytest-cov>=2.10.0 ruff==0.2.0 # must match version in .pre-commit-config.yaml setuptools>=65.5.1 tomli>=1.1.0 # needed even on py311+ so the self check passes with --python-version 3.8 -pre_commit==4.0.1 +pre_commit==3.5.0 diff --git a/test-requirements.txt b/test-requirements.txt index fbe7f4570e6b..949ad2c5bd2b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -44,7 +44,7 @@ platformdirs==3.11.0 # virtualenv pluggy==1.4.0 # via pytest -pre-commit==4.0.1 +pre-commit==3.5.0 # via -r test-requirements.in psutil==5.9.6 # via -r test-requirements.in From cf57f720794cd1ddf8243ac32db924de5957f004 Mon Sep 17 00:00:00 2001 From: gaurovgiri Date: Thu, 10 Oct 2024 14:42:40 +0545 Subject: [PATCH 3/3] chore: install pre_commit 3.5.0 or greater --- test-requirements.in | 2 +- test-requirements.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test-requirements.in b/test-requirements.in index fcc478cb3b14..f382c56d7009 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -15,4 +15,4 @@ pytest-cov>=2.10.0 ruff==0.2.0 # must match version in .pre-commit-config.yaml setuptools>=65.5.1 tomli>=1.1.0 # needed even on py311+ so the self check passes with --python-version 3.8 -pre_commit==3.5.0 +pre_commit>=3.5.0 diff --git a/test-requirements.txt b/test-requirements.txt index 949ad2c5bd2b..82684e58f40c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -26,6 +26,8 @@ identify==2.6.1 # via pre-commit iniconfig==2.0.0 # via pytest +lxml==4.9.2 ; (python_version < "3.11" or sys_platform != "win32") and python_version < "3.12" + # via -r test-requirements.in mypy-extensions==1.0.0 # via # -r mypy-requirements.txt