Skip to content

Commit 077a0f5

Browse files
chore: use py_venv directly (#476)
1 parent 36fe6b4 commit 077a0f5

4 files changed

Lines changed: 13 additions & 19 deletions

File tree

docs.bzl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ Easy streamlined way for S-CORE docs-as-code.
4141
#
4242
# For user-facing documentation, refer to `/README.md`.
4343

44-
load("@aspect_rules_py//py:defs.bzl", "py_binary")
44+
load("@aspect_rules_py//py:defs.bzl", "py_binary", "py_venv")
4545
load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
4646
load("@rules_python//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
47-
load("@score_tooling//:defs.bzl", "score_virtualenv")
4847
load("@score_tooling//bazel/rules/rules_score:rules_score.bzl", "sphinx_module")
4948

5049
def _rewrite_needs_json_to_docs_sources(labels):
@@ -269,13 +268,13 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = [], known_good =
269268
env = docs_sources_env
270269
)
271270

272-
score_virtualenv(
271+
py_venv(
273272
name = "ide_support",
274273
tags = ["cli_help=Create virtual environment (.venv_docs) for documentation support:\nbazel run //:ide_support"],
275274
venv_name = ".venv_docs",
276-
reqs = deps,
277-
# Add dependencies to ide_support, so esbonio has access to them.
275+
deps = deps,
278276
data = data,
277+
package_collisions = "warning",
279278
)
280279

281280
sphinx_docs(

src/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ compile_pip_requirements(
7878
name = "requirements",
7979
srcs = [
8080
"requirements.in",
81-
"@score_tooling//python_basics:requirements.txt",
8281
],
8382
requirements_txt = "requirements.txt",
8483
tags = [

src/requirements.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ needs-config-writer == 0.2.4
3232

3333
# Need this to enable non bazel execution
3434
bazel-runfiles
35+
36+
# Local development
37+
pytest
38+
basedpyright

src/requirements.txt

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ babel==2.18.0 \
3333
basedpyright==1.35.0 \
3434
--hash=sha256:2a7e0bd476623d48499e2b18ff6ed19dc28c51909cf9e1152ad355b5809049ad \
3535
--hash=sha256:4f4f84023df5a0cd4ee154916ba698596682ac98bacfa22c941ed6aaf07bba4e
36-
# via -r /external/score_tooling+/python_basics/requirements.txt
36+
# via -r src/requirements.in
3737
bazel-runfiles==1.8.5 \
3838
--hash=sha256:7c34df05e0115e5559cbc3069b580ef66e330e7f5dde29dba50f312dfad346d9
3939
# via -r src/requirements.in
@@ -511,9 +511,7 @@ imagesize==1.4.1 \
511511
iniconfig==2.3.0 \
512512
--hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \
513513
--hash=sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12
514-
# via
515-
# -r /external/score_tooling+/python_basics/requirements.txt
516-
# pytest
514+
# via pytest
517515
jinja2==3.1.6 \
518516
--hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
519517
--hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
@@ -838,9 +836,7 @@ nodejs-wheel-binaries==24.11.1 \
838836
--hash=sha256:c2741525c9874b69b3e5a6d6c9179a6fe484ea0c3d5e7b7c01121c8e5d78b7e2 \
839837
--hash=sha256:c79a7e43869ccecab1cae8183778249cceb14ca2de67b5650b223385682c6239 \
840838
--hash=sha256:cde41d5e4705266688a8d8071debf4f8a6fcea264c61292782672ee75a6905f9
841-
# via
842-
# -r /external/score_tooling+/python_basics/requirements.txt
843-
# basedpyright
839+
# via basedpyright
844840
numpy==2.4.2 \
845841
--hash=sha256:00ab83c56211a1d7c07c25e3217ea6695e50a3e2f255053686b081dc0b091a82 \
846842
--hash=sha256:068cdb2d0d644cdb45670810894f6a0600797a69c05f1ac478e8d31670b8ee75 \
@@ -921,7 +917,6 @@ packaging==25.0 \
921917
--hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \
922918
--hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
923919
# via
924-
# -r /external/score_tooling+/python_basics/requirements.txt
925920
# matplotlib
926921
# pytest
927922
# sphinx
@@ -1026,9 +1021,7 @@ platformdirs==4.5.1 \
10261021
pluggy==1.6.0 \
10271022
--hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \
10281023
--hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746
1029-
# via
1030-
# -r /external/score_tooling+/python_basics/requirements.txt
1031-
# pytest
1024+
# via pytest
10321025
pycparser==3.0 \
10331026
--hash=sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29 \
10341027
--hash=sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992
@@ -1049,7 +1042,6 @@ pygments==2.20.0 \
10491042
--hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \
10501043
--hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176
10511044
# via
1052-
# -r /external/score_tooling+/python_basics/requirements.txt
10531045
# accessible-pygments
10541046
# pydata-sphinx-theme
10551047
# pytest
@@ -1097,7 +1089,7 @@ pyspellchecker==0.8.4 \
10971089
pytest==9.0.1 \
10981090
--hash=sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8 \
10991091
--hash=sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad
1100-
# via -r /external/score_tooling+/python_basics/requirements.txt
1092+
# via -r src/requirements.in
11011093
python-dateutil==2.9.0.post0 \
11021094
--hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
11031095
--hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427

0 commit comments

Comments
 (0)