Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Upgrade WORKSPACE python packages for python3.8 support #3646

Merged
merged 44 commits into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
b3583c0
Upgrade WORKSPACE python packages for python3.9 support
Code0x58 Dec 8, 2020
5cc8db4
WIP: Replace Tornado with FastAPI+Uvicorn in tracker
Code0x58 Nov 18, 2020
a8e8d44
WIP: add simple topologies views
Code0x58 Nov 27, 2020
ed2b17e
WIP: add rough replacements for metrics
Code0x58 Nov 27, 2020
8b9534b
WIP: add containers endpoints
Code0x58 Nov 27, 2020
18f9452
WIP: rework main and tracker
Code0x58 Nov 27, 2020
660e4ef
Fix tracker unit tests
Code0x58 Nov 29, 2020
dfee661
quick fix of linting issues
Code0x58 Nov 29, 2020
32e7e82
WIP: factor out filtering
Code0x58 Nov 29, 2020
fc0413b
WIP: Simplify tracker+use pydantic for topology info
Code0x58 Dec 1, 2020
daab28d
WIP: unittest → pytest
Code0x58 Dec 1, 2020
6c0fa9b
WIP: get rough tracker running
Code0x58 Dec 1, 2020
2e220d3
improve tracker docs
Code0x58 Dec 1, 2020
e012a20
WIP: fixes
Code0x58 Dec 1, 2020
6fe329c
Use Python3.8 in Travis CI
Code0x58 Dec 2, 2020
3037f50
Clean up notes and some query_operator names
Code0x58 Dec 7, 2020
b1fe2d0
Merge branch 'master' into upgrade-py-dependencies
nicknezis Jan 18, 2022
9f1a612
Updates to make Python 3.9 work
nicknezis Jan 18, 2022
a52e7db
Updates to make Python 3.10 work
nicknezis Jan 20, 2022
92c6b54
[Build] libunwind revert
surahman Jan 20, 2022
ae97d07
[Build] Ubuntu 18.04 Locale
surahman Jan 21, 2022
7f8ac44
Updating Ubuntu 18.04 compile image to Python 3.8
nicknezis Jan 21, 2022
cbb2c4a
Updated centos7 image to centos8 to get Python 3.9
nicknezis Jan 21, 2022
99a56d9
Updated Ubuntu dist image to include Python 3.9
nicknezis Jan 21, 2022
58d4bbe
Updated minimum version to Python 3.8
nicknezis Jan 21, 2022
b5e8137
Renamed centos7 image to centos8
nicknezis Jan 21, 2022
7851689
Updated references to image flavors to match what we currently support
nicknezis Jan 21, 2022
f21c0ce
Updated base and test dockerfile filenames
nicknezis Jan 21, 2022
ea3860a
Fixing a versioned website file I shouldn't have modified
nicknezis Jan 21, 2022
144a3f6
Updated travis.yml to Python 3.8
nicknezis Jan 21, 2022
9626cc1
Added generic `linux` platform type and fixed broken Travis ci bash s…
nicknezis Jan 21, 2022
7bec3c3
Upgrading Travis CI OS
nicknezis Jan 21, 2022
297c0f5
Bug fix
nicknezis Jan 21, 2022
0428134
Updated to simplify flavor configs
nicknezis Jan 21, 2022
6d3b335
Dropping PyYAML back to 5.4.1
nicknezis Jan 22, 2022
edfd212
Switch to using `yaml.safe_load`
nicknezis Jan 22, 2022
b6dbf40
Merge branch 'simplify-tracker-implementation' of github.com:Code0x58…
nicknezis Jan 23, 2022
48c91bf
Upgraded `io_bazel_rules_docker` to 0.22.0
nicknezis Jan 23, 2022
f6b0b53
[Build] changing stamp to string.
surahman Jan 23, 2022
5372bec
Fixed stamp to match new label provided by docker rule plugin
nicknezis Jan 24, 2022
671da77
Updated requests to match what is used in pex_wrapper
nicknezis Jan 24, 2022
8b52ec6
Merge commit 'b970b654c764dd238ab00b482abe0fdddae3c029' into upgrade-…
nicknezis Jan 24, 2022
7c321c2
Made Python `requests` all `2.27.1`
Jan 24, 2022
733fe19
Merge branch 'master' into upgrade-py-dependencies
Jan 24, 2022
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ addons:
- libgoogle-perftools-dev

env:
- BAZEL_VERSION=4.1.0 ENABLE_HEAPCHECK=1
- BAZEL_VERSION=4.1.0 ENABLE_HEAPCHECK=1 LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8
surahman marked this conversation as resolved.
Show resolved Hide resolved

before_install:
# download and install bazel
Expand Down
83 changes: 55 additions & 28 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -188,58 +188,85 @@ py_repositories()
# pip_repositories()

# for pex repos
PEX_WHEEL = "https://pypi.python.org/packages/fa/c4/5dbdce75117b60b6ffec65bc92ac25ee873b84158a55cfbffa1d49db6eb1/pex-2.1.54-py2.py3-none-any.whl"
PEX_PKG = "https://pypi.python.org/packages/fa/c4/5dbdce75117b60b6ffec65bc92ac25ee873b84158a55cfbffa1d49db6eb1/pex-2.1.54-py2.py3-none-any.whl"

PY_WHEEL = "https://pypi.python.org/packages/53/67/9620edf7803ab867b175e4fd23c7b8bd8eba11cb761514dcd2e726ef07da/py-1.4.34-py2.py3-none-any.whl"
PYTEST_PKG = "https://files.pythonhosted.org/packages/40/76/86f886e750b81a4357b6ed606b2bcf0ce6d6c27ad3c09ebf63ed674fc86e/pytest-6.2.5-py3-none-any.whl"

PYTEST_WHEEL = "https://pypi.python.org/packages/fd/3e/d326a05d083481746a769fc051ae8d25f574ef140ad4fe7f809a2b63c0f0/pytest-3.1.3-py2.py3-none-any.whl"
REQUESTS_PKG = "https://files.pythonhosted.org/packages/39/fc/f91eac5a39a65f75a7adb58eac7fa78871ea9872283fb9c44e6545998134/requests-2.25.0-py2.py3-none-any.whl"

REQUESTS_SRC = "https://pypi.python.org/packages/d9/03/155b3e67fe35fe5b6f4227a8d9e96a14fda828b18199800d161bcefc1359/requests-2.12.3.tar.gz"
SETUPTOOLS_PKG = "https://files.pythonhosted.org/packages/3d/f2/1489d3b6c72d68bf79cd0fba6b6c7497df4ebf7d40970e2d7eceb8d0ea9c/setuptools-51.0.0-py3-none-any.whl"

SETUPTOOLS_WHEEL = "https://pypi.python.org/packages/a0/df/635cdb901ee4a8a42ec68e480c49f85f4c59e8816effbf57d9e6ee8b3588/setuptools-46.1.3-py3-none-any.whl"
WHEEL_PKG = "https://files.pythonhosted.org/packages/d4/cf/732e05dce1e37b63d54d1836160b6e24fb36eeff2313e93315ad047c7d90/wheel-0.36.1.tar.gz"

WHEEL_SRC = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-0.29.0.tar.gz"
CHARDET_PKG = "https://files.pythonhosted.org/packages/bc/a9/01ffebfb562e4274b6487b4bb1ddec7ca55ec7510b22e4c51f14098443b8/chardet-3.0.4-py2.py3-none-any.whl"

IDNA_PKG = "https://files.pythonhosted.org/packages/a2/38/928ddce2273eaa564f6f50de919327bf3a00f091b5baba8dfa9460f3a8a8/idna-2.10-py2.py3-none-any.whl"

CERTIFI_PKG = "https://files.pythonhosted.org/packages/5e/a0/5f06e1e1d463903cf0c0eebeb751791119ed7a4b3737fdc9a77f1cdfb51f/certifi-2020.12.5-py2.py3-none-any.whl"

URLLIB3_PKG = "https://files.pythonhosted.org/packages/f5/71/45d36a8df68f3ebb098d6861b2c017f3d094538c0fb98fa61d4dc43e69b9/urllib3-1.26.2-py2.py3-none-any.whl"

http_file(
name = "urllib3_pkg",
downloaded_file_path = "urllib3-1.26.2-py2.py3-none-any.whl",
sha256 = "d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473",
urls = [URLLIB3_PKG],
)

http_file(
name = "certifi_pkg",
downloaded_file_path = "certifi-2020.12.5-py2.py3-none-any.whl",
sha256 = "719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830",
urls = [CERTIFI_PKG],
)

http_file(
name = "idna_pkg",
downloaded_file_path = "idna-2.10-py2.py3-none-any.whl",
sha256 = "b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0",
urls = [IDNA_PKG],
)

http_file(
name = "pytest_whl",
downloaded_file_path = "pytest-3.1.3-py2.py3-none-any.whl",
sha256 = "2a4f483468954621fcc8f74784f3b42531e5b5008d49fc609b37bc4dbc6dead1",
urls = [PYTEST_WHEEL],
name = "chardet_pkg",
downloaded_file_path = "chardet-3.0.4-py2.py3-none-any.whl",
sha256 = "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691",
urls = [CHARDET_PKG],
)

http_file(
name = "py_whl",
downloaded_file_path = "py-1.4.34-py2.py3-none-any.whl",
sha256 = "2ccb79b01769d99115aa600d7eed99f524bf752bba8f041dc1c184853514655a",
urls = [PY_WHEEL],
name = "pytest_pkg",
downloaded_file_path = "pytest-6.2.5-py3-none-any.whl",
sha256 = "7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134",
urls = [PYTEST_PKG],
)

http_file(
name = "wheel_src",
downloaded_file_path = "wheel-0.29.0.tar.gz",
sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648",
urls = [WHEEL_SRC],
name = "wheel_pkg",
downloaded_file_path = "wheel-0.36.1.tar.gz",
sha256 = "aaef9b8c36db72f8bf7f1e54f85f875c4d466819940863ca0b3f3f77f0a1646f",
urls = [WHEEL_PKG],
)

http_file(
name = "pex_src",
name = "pex_pkg",
downloaded_file_path = "pex-2.1.54-py2.py3-none-any.whl",
sha256 = "e60b006abe8abfd3c3377128e22c33f30cc6dea89e2beb463cf8360e3626db62",
urls = [PEX_WHEEL],
urls = [PEX_PKG],
)

http_file(
name = "requests_src",
downloaded_file_path = "requests-2.12.3.tar.gz",
sha256 = "de5d266953875e9647e37ef7bfe6ef1a46ff8ddfe61b5b3652edf7ea717ee2b2",
urls = [REQUESTS_SRC],
name = "requests_pkg",
downloaded_file_path = "requests-2.25.0-py2.py3-none-any.whl",
sha256 = "e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998",
urls = [REQUESTS_PKG],
)

http_file(
name = "setuptools_wheel",
downloaded_file_path = "setuptools-46.1.3-py3-none-any.whl",
sha256 = "4fe404eec2738c20ab5841fa2d791902d2a645f32318a7850ef26f8d7215a8ee",
urls = [SETUPTOOLS_WHEEL],
name = "setuptools_pkg",
downloaded_file_path = "setuptools-51.0.0-py3-none-any.whl",
sha256 = "8c177936215945c9a37ef809ada0fab365191952f7a123618432bbfac353c529",
urls = [SETUPTOOLS_PKG],
)

# end pex repos
Expand Down
2 changes: 1 addition & 1 deletion heron/common/tests/python/pex_loader/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pex_pytest(
"pex_loader_unittest.py",
],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/common/src/python:common-py",
Expand Down
2 changes: 1 addition & 1 deletion heron/executor/tests/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pex_pytest(
size = "small",
srcs = ["heron_executor_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/executor/src/python:executor-py",
Expand Down
2 changes: 1 addition & 1 deletion heron/instance/tests/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pex_library(
name = "instance-tests-py",
srcs = ["mock_protobuf.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/proto:proto-py",
Expand Down
14 changes: 7 additions & 7 deletions heron/instance/tests/python/network/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pex_pytest(
size = "small",
srcs = ["st_stmgr_client_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":instance-network-mock",
Expand All @@ -39,7 +39,7 @@ pex_pytest(
size = "small",
srcs = ["metricsmgr_client_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":pytest-network-py",
Expand All @@ -52,7 +52,7 @@ pex_library(
name = "pytest-network-py",
srcs = ["mock_generator.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":instance-network-mock-client",
Expand All @@ -64,7 +64,7 @@ pex_pytest(
size = "small",
srcs = ["protocol_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":pytest-network-py",
Expand All @@ -78,7 +78,7 @@ pex_pytest(
size = "small",
srcs = ["heron_client_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":pytest-network-py",
Expand All @@ -92,7 +92,7 @@ pex_pytest(
size = "small",
srcs = ["gateway_looper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/src/python:instance-py",
Expand All @@ -104,7 +104,7 @@ pex_pytest(
size = "small",
srcs = ["event_looper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/src/python:instance-py",
Expand Down
20 changes: 10 additions & 10 deletions heron/instance/tests/python/utils/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pex_pytest(
size = "small",
srcs = ["communicator_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -28,7 +28,7 @@ pex_pytest(
size = "small",
srcs = ["custom_grouping_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -40,7 +40,7 @@ pex_pytest(
size = "small",
srcs = ["metrics_helper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -52,7 +52,7 @@ pex_pytest(
size = "small",
srcs = ["outgoing_tuple_helper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -64,7 +64,7 @@ pex_pytest(
size = "small",
srcs = ["pplan_helper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -76,7 +76,7 @@ pex_pytest(
size = "small",
srcs = ["topology_context_impl_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -88,7 +88,7 @@ pex_pytest(
size = "small",
srcs = ["tuple_helper_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -100,7 +100,7 @@ pex_pytest(
size = "small",
srcs = ["global_metrics_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
":common-utils-mock",
Expand All @@ -113,7 +113,7 @@ pex_pytest(
size = "small",
srcs = ["py_metrics_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand All @@ -125,7 +125,7 @@ pex_pytest(
size = "small",
srcs = ["log_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/instance/tests/python/utils:common-utils-mock",
Expand Down
4 changes: 2 additions & 2 deletions heron/proto/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ java_library(
pex_library(
name = "proto-py",
reqs = [
"protobuf==3.8.0",
"setuptools==46.1.3",
"protobuf==3.14.0",
"setuptools==51.0.0",
],
deps = [
":proto_ckptmgr_py",
Expand Down
2 changes: 1 addition & 1 deletion heron/shell/src/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pex_library(
),
reqs = [
"logging-formatter-anticrlf==1.2",
"requests==2.12.3",
"requests==2.25.0",
"tornado==4.5.3",
],
deps = [
Expand Down
6 changes: 3 additions & 3 deletions heron/statemgrs/tests/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pex_pytest(
"//heron/config/src/yaml:conf-yaml",
],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/statemgrs/src/python:statemgr-py",
Expand All @@ -24,7 +24,7 @@ pex_pytest(
"zkstatemanager_unittest.py",
],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/statemgrs/src/python:statemgr-py",
Expand All @@ -38,7 +38,7 @@ pex_pytest(
"statemanagerfactory_unittest.py",
],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/statemgrs/src/python:statemgr-py",
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/cli/src/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pex_library(
),
reqs = [
"PyYAML==3.13",
"requests==2.12.3",
"requests==2.25.0",
"netifaces==0.10.6",
],
deps = [
Expand Down
4 changes: 2 additions & 2 deletions heron/tools/cli/tests/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pex_pytest(
size = "small",
srcs = ["opts_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/tools/cli/src/python:cli-py",
Expand All @@ -17,7 +17,7 @@ pex_pytest(
size = "small",
srcs = ["client_command_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/tools/cli/src/python:cli-py",
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/explorer/src/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pex_library(
"tornado==4.5.3",
"tabulate==0.7.4",
"click==7.1.2",
"requests==2.12.3",
"requests==2.25.0",
],
deps = [
"//heron/common/src/python:common-py",
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/explorer/tests/python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pex_pytest(
size = "small",
srcs = ["explorer_unittest.py"],
reqs = [
"pytest==3.2.2",
"pytest==6.1.2",
],
deps = [
"//heron/common/src/python:common-py",
Expand Down
Loading