Skip to content

Commit c22f08c

Browse files
committed
Revert "build: use bazel to install orjson (#1)"
This reverts commit 8c2d310.
1 parent dbd48fa commit c22f08c

6 files changed

+1
-102
lines changed

WORKSPACE

-43
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,5 @@
44

55
workspace(name = "hedron_compile_commands")
66

7-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
8-
9-
# TODO(cpsauer): move everything above hedron_compile_commands_setup() into setup macros.
10-
BAZEL_SKYLIB_VERSION = "1.4.2"
11-
12-
http_archive(
13-
name = "bazel_skylib",
14-
sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
15-
urls = [
16-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{0}/bazel-skylib-{0}.tar.gz".format(BAZEL_SKYLIB_VERSION),
17-
"https://github.com/bazelbuild/bazel-skylib/releases/download/{0}/bazel-skylib-{0}.tar.gz".format(BAZEL_SKYLIB_VERSION),
18-
],
19-
)
20-
21-
http_archive(
22-
name = "rules_python",
23-
sha256 = "84aec9e21cc56fbc7f1335035a71c850d1b9b5cc6ff497306f84cced9a769841",
24-
strip_prefix = "rules_python-0.23.1",
25-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.23.1/rules_python-0.23.1.tar.gz",
26-
)
27-
28-
load("@rules_python//python:repositories.bzl", "python_register_toolchains")
29-
30-
python_register_toolchains(
31-
name = "python_toolchain",
32-
python_version = "3.11",
33-
)
34-
35-
# For re-generating python_requirements_lock.bzl:
36-
# * update python_requirements_lock.txt
37-
# * Un-comment the below
38-
# * run `bazel build @pip//...`,
39-
# * cp external/pip/requirements.bzl python_requirements_lock.bzl
40-
41-
# load("@python_toolchain//:defs.bzl", "interpreter")
42-
# load("@rules_python//python:pip.bzl", "pip_parse")
43-
# pip_parse(
44-
# name = "pip",
45-
# python_interpreter_target = interpreter,
46-
# requirements_lock = "//:python_requirements_lock.txt",
47-
# )
48-
497
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
50-
518
hedron_compile_commands_setup()

python_requirements_lock.bzl

-52
This file was deleted.

python_requirements_lock.txt

-1
This file was deleted.

refresh_compile_commands.bzl

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ refresh_compile_commands(
5252
```
5353
"""
5454

55+
5556
########################################
5657
# Implementation
5758

5859
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
59-
load("@rules_python//python:defs.bzl", "py_binary")
6060

6161
def refresh_compile_commands(
6262
name,
@@ -99,7 +99,6 @@ def refresh_compile_commands(
9999
script_name,
100100
],
101101
imports = [''], # Allows binary to import templated script, even if this macro is being called inside a sub package. See https://github.com/hedronvision/bazel-compile-commands-extractor/issues/137
102-
deps = ["@pip_orjson//:pkg"],
103102
**kwargs
104103
)
105104

requirements.bzl

Whitespace-only changes.

workspace_setup.bzl

-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
"""Workspace setup macros."""
2-
31
# Do not change the filename; it is part of the user interface.
42

53
def hedron_compile_commands_setup(module_ctx = None):
@@ -27,5 +25,3 @@ hedron_compile_commands_extension = module_extension( # Note: Doesn't break load
2725
# This extension is automatically loaded when using bzlmod (from MODULE.bazel) and will run the same function as WORKSPACE,
2826
# but passes in a module_ctx object for advanced context of the whole project, allowing for complex, project wide modifiying extensions and distinguishing between WORKSPACE and bzlmod setups.
2927
)
30-
31-
install_python_deps()

0 commit comments

Comments
 (0)