From 2876a7da198a888e08476b28784cbec1850376a7 Mon Sep 17 00:00:00 2001 From: "Joseph S. Tate" Date: Sun, 10 Nov 2024 08:06:05 -0500 Subject: [PATCH] Update workspace for new rule_pkg * removes existing, unused python rules * downloads rules_pkg and loads dependencies --- WORKSPACE | 22 +++++++++++++++------- wrksp/python_deps.bzl | 4 ---- wrksp/python_download.bzl | 8 -------- 3 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 wrksp/python_deps.bzl delete mode 100644 wrksp/python_download.bzl diff --git a/WORKSPACE b/WORKSPACE index 99097313..25ebbce6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,15 +15,23 @@ http_archive( ) # --start python-- -load("//wrksp:python_download.bzl", "python_download") - -python_download() - -load("//wrksp:python_deps.bzl", "python_deps") - -python_deps() # --end python-- +# Start rules_pkg (for pkg_tar in rules_resf/internal/container:container.bzl) +http_archive( + name = "rules_pkg", + sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz", + ], +) + +load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") + +rules_pkg_dependencies() +# End rules_pkg + http_archive( name = "com_google_protobuf", sha256 = "d19643d265b978383352b3143f04c0641eea75a75235c111cc01a1350173180e", diff --git a/wrksp/python_deps.bzl b/wrksp/python_deps.bzl deleted file mode 100644 index 92df818d..00000000 --- a/wrksp/python_deps.bzl +++ /dev/null @@ -1,4 +0,0 @@ -load("@rules_python//python:pip.bzl", "pip_repositories") - -def python_deps(): - pip_repositories() diff --git a/wrksp/python_download.bzl b/wrksp/python_download.bzl deleted file mode 100644 index 97766463..00000000 --- a/wrksp/python_download.bzl +++ /dev/null @@ -1,8 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -def python_download(): - http_archive( - name = "rules_python", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.2.0/rules_python-0.2.0.tar.gz", - sha256 = "778197e26c5fbeb07ac2a2c5ae405b30f6cb7ad1f5510ea6fdac03bded96cc6f", - )