Skip to content

Commit

Permalink
upgrade min deps (#4934)
Browse files Browse the repository at this point in the history
* upgrade min deps

* unused

* replace torchvision and torchtext

* loggers

* freeze pip

Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
Co-authored-by: Sean Naren <[email protected]>
  • Loading branch information
4 people authored Dec 1, 2020
1 parent 1176df7 commit 563f921
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci_test-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,5 +12,5 @@ black>=20.8b1
isort>=5.6.4
pre-commit>=1.0

cloudpickle>=1.2
cloudpickle>=1.3
nltk>=3.3

0 comments on commit 563f921

Please sign in to comment.