update versions (#7409)

* update versions

* chlog

* win

* str

Author: Borda

.github/prune-packages.py

@@ -0,0 +1,18 @@
+import sys
+from pprint import pprint
+
+
+def main(req_file: str, *pkgs):
+    with open(req_file, 'r') 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:])

.github/set-min-requirements.py

@@ -0,0 +1,17 @@
+requirement_fnames = (
+    'requirements.txt',
+    'requirements/extra.txt',
+    'requirements/loggers.txt',
+    'requirements/test.txt',
+    'requirements/examples.txt',
+)
+
+
+def replace_min(fname: str):
+    req = open(fname).read().replace('>=', '==')
+    open(fname, 'w').write(req)
+
+
+if __name__ == '__main__':
+    for fname in requirement_fnames:
+        replace_min(fname)

.github/workflows/ci_test-full.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Update pip
       run: |
         # needed for `pip cache` command
-        pip install --quiet "pip>=20.1" --upgrade --user
+        pip install --quiet "pip==20.2" --upgrade --user
 
     # Github Actions: Run step on specific OS: https://stackoverflow.com/a/57948488/4521646
     - name: Setup macOS
@@ -56,11 +56,7 @@ jobs:
     - name: Setup Windows
       if: runner.os == 'windows'
       run: |
-        # remove Horovod from requirements
-        fname = 'requirements/extra.txt'
-        lines = [line for line in open(fname).readlines() if not line.startswith('horovod')]
-        open(fname, 'w').writelines(lines)
-      shell: python
+        python .github/prune-packages.py requirements/extra.txt "horovod"
 
     # todo: re-enable when allow testing py 3.9 with min config, atm some Hydra issues
     #- name: Adjust minimal for Python 3.9
@@ -78,18 +74,7 @@ jobs:
     - name: Set min. dependencies
       if: matrix.requires == 'minimal'
       run: |
-        files = (
-            'requirements.txt',
-            'requirements/extra.txt',
-            'requirements/loggers.txt',
-            'requirements/test.txt',
-            'requirements/examples.txt',
-        )
-        for fname in files:
-            req = open(fname).read().replace('>=', '==')
-            open(fname, 'w').write(req)
-
-      shell: python
+        python .github/set-min-requirements.py
 
     # Note: This uses an internal pip API and may not always work
     # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
@@ -120,7 +105,7 @@ jobs:
       if: matrix.python-version == 3.9
       run: |
         # pip uninstall -y horovod
-        python -c "fname = 'requirements/extra.txt' ; lines = [line for line in open(fname).readlines() if not line.startswith('horovod')] ; open(fname, 'w').writelines(lines)"
+        python .github/prune-packages.py requirements/extra.txt "horovod"
 
     - name: Install dependencies
       env:

.github/workflows/docs-checks.yml

@@ -44,7 +44,7 @@ jobs:
           python --version
           pip --version
           # remove Horovod from requirements
-          python -c "fname = 'requirements/extra.txt' ; lines = [line for line in open(fname).readlines() if not line.startswith('horovod')] ; open(fname, 'w').writelines(lines)"
+          python .github/prune-packages.py requirements/extra.txt "horovod"
           # python -m pip install --upgrade --user pip
           pip install --requirement requirements.txt --upgrade-strategy only-if-needed --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --quiet
           pip install --requirement requirements/extra.txt

CHANGELOG.md

@@ -214,7 +214,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
     [#6476](https://github.com/PyTorchLightning/pytorch-lightning/pull/6476),
     [#6294](https://github.com/PyTorchLightning/pytorch-lightning/pull/6294),
     [#6373](https://github.com/PyTorchLightning/pytorch-lightning/pull/6373),
-    [#6088](https://github.com/PyTorchLightning/pytorch-lightning/pull/6088)
+    [#6088](https://github.com/PyTorchLightning/pytorch-lightning/pull/6088),
+    [#7398](https://github.com/PyTorchLightning/pytorch-lightning/pull/7398)
 )
 - Resolved schedule step bug for PyTorch Profiler ([#6674](https://github.com/PyTorchLightning/pytorch-lightning/pull/6674),
     [#6681](https://github.com/PyTorchLightning/pytorch-lightning/pull/6681))