From a72ee827597e4c191b750d9d0d9eb8459d2b271e Mon Sep 17 00:00:00 2001 From: Abhinav Arora Date: Tue, 4 Jan 2022 16:02:52 -0800 Subject: [PATCH 1/2] Remove Python 3.6 from CI --- .circleci/config.yml | 184 +--------------------------------------- .circleci/regenerate.py | 2 +- README.rst | 2 +- setup.py | 5 +- 4 files changed, 7 insertions(+), 186 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56ce646702..703d7f5add 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -613,9 +613,6 @@ workflows: build: jobs: - circleci_consistency - - binary_linux_wheel: - name: binary_linux_wheel_py3.6 - python_version: '3.6' - binary_linux_wheel: name: binary_linux_wheel_py3.7 python_version: '3.7' @@ -630,9 +627,6 @@ workflows: - binary_linux_wheel: name: binary_linux_wheel_py3.9 python_version: '3.9' - - binary_macos_wheel: - name: binary_macos_wheel_py3.6 - python_version: '3.6' - binary_macos_wheel: name: binary_macos_wheel_py3.7 python_version: '3.7' @@ -642,9 +636,6 @@ workflows: - binary_macos_wheel: name: binary_macos_wheel_py3.9 python_version: '3.9' - - binary_windows_wheel: - name: binary_windows_wheel_py3.6 - python_version: '3.6' - binary_windows_wheel: name: binary_windows_wheel_py3.7 python_version: '3.7' @@ -654,9 +645,6 @@ workflows: - binary_windows_wheel: name: binary_windows_wheel_py3.9 python_version: '3.9' - - binary_linux_conda: - name: binary_linux_conda_py3.6 - python_version: '3.6' - binary_linux_conda: name: binary_linux_conda_py3.7 python_version: '3.7' @@ -666,9 +654,6 @@ workflows: - binary_linux_conda: name: binary_linux_conda_py3.9 python_version: '3.9' - - binary_macos_conda: - name: binary_macos_conda_py3.6 - python_version: '3.6' - binary_macos_conda: name: binary_macos_conda_py3.7 python_version: '3.7' @@ -678,9 +663,6 @@ workflows: - binary_macos_conda: name: binary_macos_conda_py3.9 python_version: '3.9' - - binary_windows_conda: - name: binary_windows_conda_py3.6 - python_version: '3.6' - binary_windows_conda: name: binary_windows_conda_py3.7 python_version: '3.7' @@ -720,15 +702,10 @@ workflows: jobs: - cachesetup_linux: name: cachesetup_linux_py_any - python_version: '3.6' - - unittest_linux: - name: unittest_linux_py3.6 - python_version: '3.6' - requires: - - cachesetup_linux_py_any + python_version: '3.7' - stylecheck: - name: stylecheck_py3.6 - python_version: '3.6' + name: stylecheck_py_any + python_version: '3.7' - unittest_linux: name: unittest_linux_py3.7 python_version: '3.7' @@ -746,12 +723,7 @@ workflows: - cachesetup_linux_py_any - cachesetup_windows: name: cachesetup_windows_py_any - python_version: '3.6' - - unittest_windows: - name: unittest_windows_py3.6 - python_version: '3.6' - requires: - - cachesetup_windows_py_any + python_version: '3.7' - unittest_windows: name: unittest_windows_py3.7 python_version: '3.7' @@ -773,34 +745,6 @@ workflows: filters: branches: only: nightly - - binary_linux_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_wheel_py3.6 - python_version: '3.6' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_wheel_py3.6_upload - requires: - - nightly_binary_linux_wheel_py3.6 - - smoke_test_linux_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_wheel_py3.6_smoke_test_pip - python_version: '3.6' - requires: - - nightly_binary_linux_wheel_py3.6_upload - binary_linux_wheel: filters: branches: @@ -885,24 +829,6 @@ workflows: python_version: '3.9' requires: - nightly_binary_linux_wheel_py3.9_upload - - binary_macos_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_wheel_py3.6 - python_version: '3.6' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_wheel_py3.6_upload - requires: - - nightly_binary_macos_wheel_py3.6 - binary_macos_wheel: filters: branches: @@ -957,34 +883,6 @@ workflows: name: nightly_binary_macos_wheel_py3.9_upload requires: - nightly_binary_macos_wheel_py3.9 - - binary_windows_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.6 - python_version: '3.6' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.6_upload - requires: - - nightly_binary_windows_wheel_py3.6 - - smoke_test_windows_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.6_smoke_test_pip - python_version: '3.6' - requires: - - nightly_binary_windows_wheel_py3.6_upload - binary_windows_wheel: filters: branches: @@ -1069,34 +967,6 @@ workflows: python_version: '3.9' requires: - nightly_binary_windows_wheel_py3.9_upload - - binary_linux_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.6 - python_version: '3.6' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.6_upload - requires: - - nightly_binary_linux_conda_py3.6 - - smoke_test_linux_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_linux_conda_py3.6_smoke_test_conda - python_version: '3.6' - requires: - - nightly_binary_linux_conda_py3.6_upload - binary_linux_conda: filters: branches: @@ -1181,24 +1051,6 @@ workflows: python_version: '3.9' requires: - nightly_binary_linux_conda_py3.9_upload - - binary_macos_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.6 - python_version: '3.6' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_macos_conda_py3.6_upload - requires: - - nightly_binary_macos_conda_py3.6 - binary_macos_conda: filters: branches: @@ -1253,34 +1105,6 @@ workflows: name: nightly_binary_macos_conda_py3.9_upload requires: - nightly_binary_macos_conda_py3.9 - - binary_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.6 - python_version: '3.6' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.6_upload - requires: - - nightly_binary_windows_conda_py3.6 - - smoke_test_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.6_smoke_test_conda - python_version: '3.6' - requires: - - nightly_binary_windows_conda_py3.6_upload - binary_windows_conda: filters: branches: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 01900b233d..1458b27302 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -20,7 +20,7 @@ import os.path -PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"] +PYTHON_VERSIONS = ["3.7", "3.8", "3.9"] DOC_VERSION = ('linux', '3.8') diff --git a/README.rst b/README.rst index 3c4d014d07..b95548c1bf 100644 --- a/README.rst +++ b/README.rst @@ -29,7 +29,7 @@ We recommend Anaconda as a Python package management system. Please refer to `py :header: "PyTorch version", "torchtext version", "Supported Python version" :widths: 10, 10, 10 - nightly build, main, ">=3.6, <=3.9" + nightly build, main, ">=3.7, <=3.9" 1.10.0, 0.11.0, ">=3.6, <=3.9" 1.9.1, 0.10.1, ">=3.6, <=3.9" 1.9, 0.10, ">=3.6, <=3.9" diff --git a/setup.py b/setup.py index 5db3388053..bd141f68b6 100644 --- a/setup.py +++ b/setup.py @@ -92,12 +92,9 @@ def run(self): ], python_requires='>=3.5', classifiers=[ - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3.9', ], # Package info packages=find_packages(exclude=('test*', 'build_tools*')), From f4978434a8805ba3ae1c26d389e17b17554eb9a7 Mon Sep 17 00:00:00 2001 From: Abhinav Arora Date: Tue, 4 Jan 2022 16:04:57 -0800 Subject: [PATCH 2/2] Regenerate circleci config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 703d7f5add..9fae77d4eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -703,14 +703,14 @@ workflows: - cachesetup_linux: name: cachesetup_linux_py_any python_version: '3.7' - - stylecheck: - name: stylecheck_py_any - python_version: '3.7' - unittest_linux: name: unittest_linux_py3.7 python_version: '3.7' requires: - cachesetup_linux_py_any + - stylecheck: + name: stylecheck_py3.7 + python_version: '3.7' - unittest_linux: name: unittest_linux_py3.8 python_version: '3.8'