diff --git a/.github/workflows/ci_install-pkg.yml b/.github/workflows/ci_install-pkg.yml index 50193b4ec7..24d92a9d88 100644 --- a/.github/workflows/ci_install-pkg.yml +++ b/.github/workflows/ci_install-pkg.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Create package run: | @@ -36,7 +36,7 @@ jobs: matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15, windows-2019] # - python-version: [3.7] + python-version: [3.8] steps: - uses: actions/checkout@master diff --git a/.github/workflows/ci_test-base.yml b/.github/workflows/ci_test-base.yml index 1465e1370e..18c3415d97 100644 --- a/.github/workflows/ci_test-base.yml +++ b/.github/workflows/ci_test-base.yml @@ -12,10 +12,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false - # max-parallel: 6 matrix: os: [ubuntu-20.04, windows-2019, macOS-10.15] - python-version: [3.7] + python-version: [3.8] # Timeout: https://stackoverflow.com/a/59076067/4521646 timeout-minutes: 20 diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index d0aad177db..63dbd2dede 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -13,12 +13,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false - # max-parallel: 6 matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15] #, windows-2019 - python-version: [3.7, 3.8] + python-version: [3.7, 3.9] requires: ['minimal', 'latest'] + exclude: + # - {python-version: 3.7, requires: 'latest'} + - {python-version: 3.9, requires: 'minimal'} # Timeout: https://stackoverflow.com/a/59076067/4521646 # the reason for high number is MUCH slower tests on macOS and py3.8 diff --git a/.github/workflows/code-format.yml b/.github/workflows/code-format.yml index 9bb2665dca..23ff35b7fd 100644 --- a/.github/workflows/code-format.yml +++ b/.github/workflows/code-format.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | pip install flake8 diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 97863fec5b..497b47969d 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 # 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 @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 # 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 diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index fbb0b25be7..ce1473e3e0 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: >- diff --git a/.readthedocs.yml b/.readthedocs.yml index 9ea7074550..a1409a661d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -17,7 +17,7 @@ formats: # Optionally set the version of Python and requirements required to build your docs python: - version: 3.7 + version: 3.8 install: - requirements: docs/requirements.txt #- requirements: requirements.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 58395de184..3b76e25bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added nn.Module support for FasterRCNN backbone ([#661](https://github.com/PyTorchLightning/lightning-bolts/pull/661)) +- Added Python 3.9 support ([#786](https://github.com/PyTorchLightning/lightning-bolts/pull/786)) + + ### Changed - VAE now uses deterministic KL divergence during training, previously estimated KL divergence by random sampling ([#760](https://github.com/PyTorchLightning/lightning-bolts/pull/760)) @@ -26,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- Removed PyTorch 1.6 support ([#786](https://github.com/PyTorchLightning/lightning-bolts/pull/786)) + + - Removed Python 3.6 support ([#785](https://github.com/PyTorchLightning/lightning-bolts/pull/785)) ### Fixed diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c718e0cc41..84a6a0e899 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,8 +25,6 @@ jobs: pool: azure-gpus-spot - # ToDo: this need to have installed docker in the base image... - #container: "pytorchlightning/pytorch_lightning:base-cuda-py$[ variables['python.version'] ]-torch1.6" container: image: "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.8" #endpoint: azureContainerRegistryConnection diff --git a/requirements.txt b/requirements.txt index 1fd6e34b99..512ca42104 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -torch>=1.6 +torch>=1.7.* torchmetrics>=0.4.1 pytorch-lightning>=1.3.0 packaging diff --git a/requirements/models.txt b/requirements/models.txt index 0d7507a2f8..fa668ce484 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -1,7 +1,7 @@ -torchvision>=0.7 +torchvision>=0.8.* scikit-learn>=0.23 Pillow opencv-python-headless -gym>=0.17.2, <0.20.0 # needed for RL +gym[atari]>=0.17.2, <0.20.0 # needed for RL atari_py==0.2.* box2d-py==2.3.* diff --git a/setup.py b/setup.py index 9628aa9550..7dbbf21de1 100755 --- a/setup.py +++ b/setup.py @@ -84,5 +84,6 @@ def _prepare_extras(): "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], )