From 563f9214fa4add3e984de993c231ac0ff2f4fca6 Mon Sep 17 00:00:00 2001 From: Jeff Yang Date: Tue, 1 Dec 2020 23:49:44 +0630 Subject: [PATCH] upgrade min deps (#4934) * upgrade min deps * unused * replace torchvision and torchtext * loggers * freeze pip Co-authored-by: Jirka Borovec Co-authored-by: Jirka Borovec Co-authored-by: Sean Naren --- .github/workflows/ci_test-full.yml | 6 +++++- requirements.txt | 2 +- requirements/extra.txt | 2 +- requirements/test.txt | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index ee51dc5aee..09d1a6eb4b 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -36,7 +36,8 @@ jobs: - name: Update Pip run: | - pip install --quiet "pip>=20.1" --upgrade --user # needed for get pip cacher folder + # todo: unfreeze PIP after resolving minimal dependencies + pip install --quiet "pip==20.1" --upgrade --user # needed for get pip cacher folder # Github Actions: Run step on specific OS: https://stackoverflow.com/a/57948488/4521646 - name: Setup macOS @@ -56,12 +57,15 @@ jobs: if: runner.os == 'macOS' && matrix.requires == 'minimal' run : | python -c "fname = 'requirements.txt' ; req = open(fname).read().replace('torch>=1.3', 'torch>=1.4') ; open(fname, 'w').write(req)" + python -c "fname = 'requirements/examples.txt' ; req = open(fname).read().replace('torchvision>=0.4.1', 'torchvision>=0.5.0') ; open(fname, 'w').write(req)" + python -c "fname = 'requirements/extra.txt' ; req = open(fname).read().replace('torchtext>=0.3.1', 'torchtext>=0.5.0') ; open(fname, 'w').write(req)" - name: Set min. dependencies if: matrix.requires == 'minimal' run: | python -c "fname = 'requirements.txt' ; req = open(fname).read().replace('>=', '==') ; open(fname, 'w').write(req)" python -c "fname = 'requirements/extra.txt' ; req = open(fname).read().replace('>=', '==') ; open(fname, 'w').write(req)" + python -c "fname = 'requirements/loggers.txt' ; req = open(fname).read().replace('>=', '==') ; open(fname, 'w').write(req)" python -c "fname = 'requirements/test.txt' ; req = open(fname).read().replace('>=', '==') ; open(fname, 'w').write(req)" python -c "fname = 'requirements/examples.txt' ; req = open(fname).read().replace('>=', '==') ; open(fname, 'w').write(req)" # remove Fairscale from requirements diff --git a/requirements.txt b/requirements.txt index 0f8423e086..4b8a3efb5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # the default package dependencies -numpy>=1.16.4 +numpy>=1.16.6 torch>=1.3 future>=0.17.1 # required for builtins in setup.py # pyyaml>=3.13 diff --git a/requirements/extra.txt b/requirements/extra.txt index 76ce46ae7f..2fd1e94a91 100644 --- a/requirements/extra.txt +++ b/requirements/extra.txt @@ -2,7 +2,7 @@ matplotlib>=3.1.1 horovod>=0.20.2 # no need to install with [pytorch] as pytorch is already installed -omegaconf>=2.0.0 +omegaconf>=2.0.1 # scipy>=0.13.3 scikit-learn>=0.22.2 torchtext>=0.3.1, <0.7 # TODO: temporary fix fix for compatibility diff --git a/requirements/test.txt b/requirements/test.txt index e9c50f65ea..d553bb9b78 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,8 +1,8 @@ coverage>=5.0 codecov>=2.1 pytest>=5.0 -pytest-cov -pytest-flake8 +# pytest-cov +# pytest-flake8 flake8>=3.6 flake8-black check-manifest @@ -12,5 +12,5 @@ black>=20.8b1 isort>=5.6.4 pre-commit>=1.0 -cloudpickle>=1.2 +cloudpickle>=1.3 nltk>=3.3