From e2143d3e5bbd6ecb88c2ba391a1ca62776ef9da1 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Mon, 2 Oct 2023 16:04:27 -0500 Subject: [PATCH] Add sort check for requirements.txt files --- .pre-commit-config.yaml | 6 +++++- tests/requirements-linux.txt | 2 -- tests/requirements-macos.txt | 2 -- tests/requirements-windows.txt | 2 -- tests/requirements.txt | 4 +--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 34f2c97018..ae9caec20c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ exclude: | test-recipes | test-skeleton )/ | - .*\.(patch|diff) | + .*\.(patch|diff) ) repos: # generic verification and formatting @@ -35,6 +35,10 @@ repos: ) # catch git merge/rebase problems - id: check-merge-conflict + # sort requirements files + - id: file-contents-sorter + files: ^tests/requirements.*\.txt + args: [--unique] # Python verification and formatting - repo: https://github.com/Lucas-C/pre-commit-hooks rev: v1.5.4 diff --git a/tests/requirements-linux.txt b/tests/requirements-linux.txt index cb3ae7e805..149ce09bad 100644 --- a/tests/requirements-linux.txt +++ b/tests/requirements-linux.txt @@ -1,5 +1,3 @@ -# conda-build supplemental test dependencies -# run as 'conda install -c defaults --file tests/requirements-linux.txt' patch patchelf shellcheck diff --git a/tests/requirements-macos.txt b/tests/requirements-macos.txt index dbe8e3dd81..133b191333 100644 --- a/tests/requirements-macos.txt +++ b/tests/requirements-macos.txt @@ -1,4 +1,2 @@ -# conda-build supplemental test dependencies -# run as 'conda install -c defaults --file tests/requirements-macos.txt' patch shellcheck diff --git a/tests/requirements-windows.txt b/tests/requirements-windows.txt index 8d40d2482b..d08b4cac29 100644 --- a/tests/requirements-windows.txt +++ b/tests/requirements-windows.txt @@ -1,4 +1,2 @@ -# conda-build supplemental test dependencies -# run as 'conda install -c defaults --file tests/requirements-windows.txt' m2-git m2-patch diff --git a/tests/requirements.txt b/tests/requirements.txt index b0ac07be77..02d34d6787 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,9 +1,8 @@ -# conda-build test dependencies -# run as 'conda install -c defaults --file tests/requirements.txt' anaconda-client beautifulsoup4 chardet conda >=4.13 +conda-forge::allure-pytest conda-index conda-package-handling conda-verify @@ -27,7 +26,6 @@ pytest-replay pytest-rerunfailures pytest-xdist python-libarchive-c -conda-forge::allure-pytest pytz requests ripgrep