From 613800eadf173caa597b3c82819b2017fd1f6e62 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 17 Jan 2022 11:33:14 +0100 Subject: [PATCH] prune-packages --- .github/assistant.py | 22 ++++++++++++++++++++++ .github/prune-packages.py | 18 ------------------ .github/workflows/ci_test-conda.yml | 6 +++--- requirements/test.txt | 1 + 4 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 .github/assistant.py delete mode 100644 .github/prune-packages.py diff --git a/.github/assistant.py b/.github/assistant.py new file mode 100644 index 00000000000..ee18be21cbd --- /dev/null +++ b/.github/assistant.py @@ -0,0 +1,22 @@ +from pprint import pprint + +import fire + + +class AssistantCLI: + @staticmethod + def prune_packages(req_file: str, *pkgs: str) -> None: + """Prune packages from requirement file.""" + with open(req_file) as fp: + lines = fp.readlines() + + for pkg in pkgs: + lines = [ln for ln in lines if not ln.startswith(pkg)] + pprint(lines) + + with open(req_file, "w") as fp: + fp.writelines(lines) + + +if __name__ == "__main__": + fire.Fire(AssistantCLI) diff --git a/.github/prune-packages.py b/.github/prune-packages.py deleted file mode 100644 index fb0e6018d30..00000000000 --- a/.github/prune-packages.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys -from pprint import pprint - - -def main(req_file: str, *pkgs): - with open(req_file) as fp: - lines = fp.readlines() - - for pkg in pkgs: - lines = [ln for ln in lines if not ln.startswith(pkg)] - pprint(lines) - - with open(req_file, "w") as fp: - fp.writelines(lines) - - -if __name__ == "__main__": - main(*sys.argv[1:]) diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index b2c2f5f4892..daa82cddfd0 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -20,8 +20,7 @@ jobs: python-version: ["3.8"] pytorch-version: ["1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11"] include: - - python-version: 3.7 - pytorch-version: '1.3' + - {python-version: 3.7, pytorch-version: '1.3'} env: PYTEST_ARTEFACT: test-conda-py${{ matrix.python-version }}-pt${{ matrix.pytorch-version }}.xml TRANSFORMERS_CACHE: .cache/huggingface/ @@ -83,7 +82,8 @@ jobs: conda list pip --version python ./requirements/adjust-versions.py requirements.txt - python ./.github/prune-packages.py requirements/image.txt torchvision + python ./.github/assistant.py prune-packages requirements/image.txt torchvision + python ./.github/assistant.py prune-packages requirements/detection.txt torchvision pip install -q "numpy==1.20.0" # try to fix cocotools for PT 1.4 & 1.9 pip install --requirement requirements.txt --quiet pip install --requirement requirements/devel.txt --quiet diff --git a/requirements/test.txt b/requirements/test.txt index 447d85c9072..d1bb75f7c32 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -9,6 +9,7 @@ twine>=3.2 mypy>=0.790 phmdoctest>=1.1.1 pre-commit>=1.0 +fire cloudpickle>=1.3 scikit-learn>=0.24