Skip to content

Commit

Permalink
Upgrade all dependencies (except blender) (#65)
Browse files Browse the repository at this point in the history
When our render server is run again Blender 4.0 the depth and label
images show up as normal rgb, so for now we defer working on that.
  • Loading branch information
jwnimmer-tri authored Mar 25, 2024
1 parent 4157b67 commit 03551de
Show file tree
Hide file tree
Showing 8 changed files with 839 additions and 727 deletions.
2 changes: 1 addition & 1 deletion .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: BSD-2-Clause

USE_BAZEL_VERSION=6.3.2
USE_BAZEL_VERSION=7.1.1
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# SPDX-License-Identifier: BSD-2-Clause

# Don't use bzlmod yet.
common --enable_bzlmod=false

common --symlink_prefix=.bazel/
common --keep_going=yes
build --test_output=errors
build --test_summary=terse

# Inject DISPLAY into test runner environment for tests that use X.
build --test_env=DISPLAY
build --sandbox_add_mount_pair=/tmp/.X11-unix

# Add `bazel test --config=lint` shortcut for linting.
build:lint --test_tag_filters=lint
Expand Down
4 changes: 2 additions & 2 deletions bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import sys
import urllib.request as request

# The pinned version and checksum of bazelisk.
_VERSION = "1.18.0"
_SHA256 = "94655ff9cb5286677ee56cd5ac2e82cb91be4385ceb790b0a83369bc79a796b9"
_VERSION = "1.19.0"
_SHA256 = "9adad8df709e8e8d657df3de48594967d2ba89854b8ebc734856d41852547a4a"
_URL = f"https://raw.githubusercontent.com/bazelbuild/bazelisk/v{_VERSION}/bazelisk.py" # noqa


Expand Down
491 changes: 258 additions & 233 deletions examples/requirements.txt

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
# To compile this file into requirements.txt, run:
# ./tools/upgrade.sh

bpy
# TODO(jwnimmer-tri) When upgrading to blender 4.0, we'll need to figure out
# how to make depth and label images work correctly.
bpy==3.6.0
flask
593 changes: 316 additions & 277 deletions requirements.txt

Large diffs are not rendered by default.

454 changes: 248 additions & 206 deletions test/requirements.txt

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions tools/workspace_versions.bzl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
WORKSPACE_VERSIONS = {
"buildifier": {
"version": "6.3.3",
"version": "6.4.0",
"binaries": {
"buildifier-darwin-amd64": "3c36a3217bd793815a907a8e5bf81c291e2d35d73c6073914640a5f42e65f73f",
"buildifier-darwin-arm64": "9bb366432d515814766afcf6f9010294c13876686fbbe585d5d6b4ff0ca3e982",
"buildifier-linux-amd64": "42f798ec532c58e34401985043e660cb19d5ae994e108d19298c7d229547ffca",
"buildifier-linux-arm64": "6a03a1cf525045cb686fc67cd5d64cface5092ebefca3c4c93fb6e97c64e07db",
"buildifier-darwin-amd64": "eeb47b2de27f60efe549348b183fac24eae80f1479e8b06cac0799c486df5bed",
"buildifier-darwin-arm64": "fa07ba0d20165917ca4cc7609f9b19a8a4392898148b7babdf6bb2a7dd963f05",
"buildifier-linux-amd64": "be63db12899f48600bad94051123b1fd7b5251e7661b9168582ce52396132e92",
"buildifier-linux-arm64": "18540fc10f86190f87485eb86963e603e41fa022f88a2d1b0cf52ff252b5e1dd",
},
},
"rules_python": {
"version": "0.25.0",
"sha256": "5868e73107a8e85d8f323806e60cad7283f34b32163ea6ff1020cf27abef6036",
"version": "0.31.0",
"sha256": "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
},
}

0 comments on commit 03551de

Please sign in to comment.