Skip to content

Dependencies: build updates #10594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moderation wants to merge 8 commits into from
Closed

Dependencies: build updates #10594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6baa475
Dependencies: dataplane updates
moderation Mar 24, 2020
b8f9cb8
Merge remote-tracking branch 'upstream/master'
moderation Mar 25, 2020
e464c74
Merge remote-tracking branch 'upstream/master'
moderation Mar 25, 2020
4a51bb7
Merge remote-tracking branch 'upstream/master'
moderation Mar 31, 2020
1af7590
Dependencies: build updates.
moderation Mar 31, 2020
1b82776
Try to fix Kafka Python version issues.
moderation Mar 31, 2020
3e4dbe6
Merge remote-tracking branch 'upstream/master'
moderation Apr 7, 2020
972fa26
Remove version from documentation only link to address feedback. Bump…
moderation Apr 7, 2020
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 bazel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ It is recommended to use [Bazelisk](https://github.com/bazelbuild/bazelisk) inst
On Linux, run the following commands:

```
sudo wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v0.0.8/bazelisk-linux-amd64
sudo wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64
sudo chmod +x /usr/local/bin/bazel
```

Expand Down
2 changes: 1 addition & 1 deletion bazel/external/jinja.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ licenses(["notice"]) # Apache 2

py_library(
name = "jinja2",
srcs = glob(["jinja2/**/*.py"]),
srcs = glob(["src/jinja2/*.py"]),
visibility = ["//visibility:public"],
deps = ["@com_github_pallets_markupsafe//:markupsafe"],
)
28 changes: 14 additions & 14 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
REPOSITORY_LOCATIONS = dict(
bazel_compdb = dict(
sha256 = "87e376a685eacfb27bcc0d0cdf5ded1d0b99d868390ac50f452ba6ed781caffe",
strip_prefix = "bazel-compilation-database-0.4.2",
urls = ["https://github.com/grailbio/bazel-compilation-database/archive/0.4.2.tar.gz"],
sha256 = "9a1f88851a556104c67065c3dafa99ce47235635713d717f26a43637c8b4ab3d",
strip_prefix = "bazel-compilation-database-0.4.3",
urls = ["https://github.com/grailbio/bazel-compilation-database/archive/0.4.3.tar.gz"],
),
bazel_gazelle = dict(
sha256 = "86c6d481b3f7aedc1d60c1c211c6f76da282ae197c3b3160f54bd3a8f847896f",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz"],
sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz"],
),
bazel_toolchains = dict(
sha256 = "1342f84d4324987f63307eb6a5aac2dff6d27967860a129f5cd40f8f9b6fd7dd",
strip_prefix = "bazel-toolchains-2.2.0",
sha256 = "e754d6028845423b2cc7a6c375f9657fe0b0bbb196d76c8de6dd129c3aa74023",
strip_prefix = "bazel-toolchains-2.2.3",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.2.0/bazel-toolchains-2.2.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.2.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.2.3/bazel-toolchains-2.2.3.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.2.3.tar.gz",
],
),
build_bazel_rules_apple = dict(
Expand Down Expand Up @@ -95,9 +95,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/gabime/spdlog/archive/v1.4.0.tar.gz"],
),
com_github_google_libprotobuf_mutator = dict(
sha256 = "",
sha256 = "f6def6cdf63e29a367d46c0ad9e3e31eed89d031e22e0caac126f1e62d8b3fd0",
strip_prefix = "libprotobuf-mutator-3521f47a2828da9ace403e4ecc4aece1a84feb36",
# 2020-02-04
# 2020-02-05
urls = ["https://github.com/google/libprotobuf-mutator/archive/3521f47a2828da9ace403e4ecc4aece1a84feb36.tar.gz"],
),
com_github_gperftools_gperftools = dict(
Expand Down Expand Up @@ -194,9 +194,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/nodejs/http-parser/archive/v2.9.3.tar.gz"],
),
com_github_pallets_jinja = dict(
sha256 = "db49236731373e4f3118af880eb91bb0aa6978bc0cf8b35760f6a026f1a9ffc4",
strip_prefix = "jinja-2.10.3",
urls = ["https://github.com/pallets/jinja/archive/2.10.3.tar.gz"],
sha256 = "35ccc930685e37c4762258917e822b5db29b60431afb6d6e00e22b4f5287165a",
strip_prefix = "jinja-2.11.1",
urls = ["https://github.com/pallets/jinja/archive/2.11.1.tar.gz"],
),
com_github_pallets_markupsafe = dict(
sha256 = "222a10e3237d92a9cd45ed5ea882626bc72bc5e0264d3ed0f2c9129fa69fc167",
Expand Down
8 changes: 4 additions & 4 deletions ci/windows_ci_setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ function Checksum

mkdir "$env:TOOLS_BIN_DIR"
$wc = New-Object System.Net.WebClient
$wc.DownloadFile("https://github.com/bazelbuild/bazelisk/releases/download/v1.0/bazelisk-windows-amd64.exe", "$env:TOOLS_BIN_DIR\bazel.exe")
$wc.DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip", "$env:TOOLS_BIN_DIR\ninja-win.zip")
$wc.DownloadFile("https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/bazelisk-windows-amd64.exe", "$env:TOOLS_BIN_DIR\bazel.exe")
$wc.DownloadFile("https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip", "$env:TOOLS_BIN_DIR\ninja-win.zip")

# Check the SHA256 file hash of each downloaded file.
Checksum $env:TOOLS_BIN_DIR\bazel.exe 96395ee9e3fb9f4499fcaffa8a94dd72b0748f495f366bc4be44dbf09d6827fc SHA256
Checksum $env:TOOLS_BIN_DIR\ninja-win.zip 2d70010633ddaacc3af4ffbd21e22fae90d158674a09e132e06424ba3ab036e9 SHA256
Checksum $env:TOOLS_BIN_DIR\bazel.exe 31fa9fcf250fe64aa3c5c83b69d76e1e9571b316a58bb5c714084495623e38b0 SHA256
Checksum $env:TOOLS_BIN_DIR\ninja-win.zip 919fd158c16bf135e8a850bb4046ec1ce28a7439ee08b977cd0b7f6b3463d178 SHA256

Unzip "$env:TOOLS_BIN_DIR\ninja-win.zip" "$env:TOOLS_BIN_DIR"
2 changes: 1 addition & 1 deletion configs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jinja2==2.10.3
Jinja2==2.11.1
2 changes: 1 addition & 1 deletion docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GitPython==3.0.0
Jinja2==2.10.3
Jinja2==2.11.1
MarkupSafe==1.1.1
Pygments==2.4.2
alabaster==0.7.12
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/network/kafka/protocol/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Main library file containing all the protocol generation logic.

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/network/kafka/protocol/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Launcher for generating Kafka protocol code.

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/network/kafka/serialization/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Main library file containing all the composite deserializer logic.

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/network/kafka/serialization/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Launcher for generating composite serializer code.

Expand Down
2 changes: 1 addition & 1 deletion ...extensions/filters/network/kafka/broker/integration_test/kafka_broker_integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

import random
import os
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/filters/network/kafka/protocol/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Launcher for generating Kafka protocol tests.

Expand Down
2 changes: 1 addition & 1 deletion test/extensions/filters/network/kafka/serialization/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

# Launcher for generating composite serializer tests.

Expand Down