diff --git a/tensorboard/pip_package/requirements.txt b/tensorboard/pip_package/requirements.txt index a8632f6f20..c2400a1a3f 100644 --- a/tensorboard/pip_package/requirements.txt +++ b/tensorboard/pip_package/requirements.txt @@ -16,8 +16,6 @@ # Non-vendored runtime dependencies of TensorBoard. absl-py >= 0.4 -# futures is a backport of the python 3.2+ concurrent.futures module -futures >= 3.1.1; python_version < "3" grpcio >= 1.24.3 google-auth >= 1.6.3, < 2 google-auth-oauthlib >= 0.4.1, < 0.5 @@ -29,6 +27,4 @@ setuptools >= 41.0.0 tensorboard-data-server >= 0.6.0, < 0.7.0 tensorboard-plugin-wit >= 1.6.0 werkzeug >= 0.11.15 -# python3 specifically requires wheel 0.26 -wheel; python_version < "3" -wheel >= 0.26; python_version >= "3" +wheel >= 0.26 diff --git a/tensorboard/pip_package/requirements_dev.txt b/tensorboard/pip_package/requirements_dev.txt index 1782cef3aa..c621e405c5 100644 --- a/tensorboard/pip_package/requirements_dev.txt +++ b/tensorboard/pip_package/requirements_dev.txt @@ -23,7 +23,7 @@ boto3==1.9.86 moto==1.3.7 # For linting -black==20.8b1; python_version >= "3.6" +black==20.8b1 flake8==3.7.8 yamllint==1.17.0 diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py index 8971d4757a..6279dcacf6 100644 --- a/tensorboard/pip_package/setup.py +++ b/tensorboard/pip_package/setup.py @@ -62,8 +62,6 @@ def get_readme(): "tf_projector_plugin/projector_binary.js", ], }, - # Disallow python 3.0 and 3.1 which lack a 'futures' module (see above). - python_requires=">= 2.7, != 3.0.*, != 3.1.*", install_requires=REQUIRED_PACKAGES, tests_require=REQUIRED_PACKAGES, # PyPI package information. @@ -73,12 +71,12 @@ def get_readme(): "Intended Audience :: Education", "Intended Audience :: Science/Research", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3 :: Only", "Topic :: Scientific/Engineering :: Mathematics", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Software Development :: Libraries",