Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions tensorboard/pip_package/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tensorboard/pip_package/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions tensorboard/pip_package/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional but maybe kill the futures and wheel deps that were py2-only too?

# futures is a backport of the python 3.2+ concurrent.futures module
futures >= 3.1.1; python_version < "3"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be nice to re-add python_requires with python_requires=">=3.6", it will block folks with older version Python version from installing the library through pip https://packaging.python.org/guides/dropping-older-python-versions/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding one in #5083.

python_requires=">= 2.7, != 3.0.*, != 3.1.*",
install_requires=REQUIRED_PACKAGES,
tests_require=REQUIRED_PACKAGES,
# PyPI package information.
Expand All @@ -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",
Expand Down