Skip to content

Commit 7c705c2

Browse files
mmikitkammikitka
authored
Renamed pip_deps to container_pip_deps (#1576)
1 parent aad9436 commit 7c705c2

7 files changed

Lines changed: 54 additions & 54 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")
167167

168168
container_deps()
169169

170-
load("@io_bazel_rules_docker//repositories:pip_repositories.bzl", "pip_deps")
170+
load("@io_bazel_rules_docker//repositories:pip_repositories.bzl", "io_bazel_rules_docker_pip_deps")
171171

172-
pip_deps()
172+
io_bazel_rules_docker_pip_deps()
173173

174174
load(
175175
"@io_bazel_rules_docker//container:container.bzl",

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ load("//repositories:deps.bzl", container_deps = "deps")
3838
container_deps()
3939

4040
# pip deps are only needed for running tests.
41-
load("//repositories:pip_repositories.bzl", "pip_deps")
41+
load("//repositories:pip_repositories.bzl", "io_bazel_rules_docker_pip_deps")
4242

43-
pip_deps()
43+
io_bazel_rules_docker_pip_deps()
4444

4545
load(
4646
"//container:container.bzl",

‎container/image_test.py‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -594,14 +594,14 @@ def test_py_image_complex(self):
594594
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata',
595595
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata/py_image_complex.py',
596596
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata/py_image_complex.binary',
597+
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0',
598+
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/__init__.py',
597599
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata/test',
598600
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata/test/__init__.py',
599-
'./app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2',
600-
'./app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/__init__.py',
601+
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2',
602+
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/__init__.py',
601603
'./app/testdata/py_image_complex.binary.runfiles/__init__.py',
602604
'./app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker/testdata/__init__.py',
603-
'./app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0',
604-
'./app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/__init__.py',
605605
'./app/io_bazel_rules_docker',
606606
'/app',
607607
'/app/testdata',
@@ -661,30 +661,30 @@ def test_py_image_complex(self):
661661
'/app',
662662
'/app/testdata',
663663
'/app/testdata/py_image_complex.binary.runfiles',
664-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0',
665-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six.py',
666-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info',
667-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/DESCRIPTION.rst',
668-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/METADATA',
669-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/RECORD',
670-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/WHEEL',
671-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/metadata.json',
672-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/top_level.txt',
664+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0',
665+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six.py',
666+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info',
667+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/DESCRIPTION.rst',
668+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/METADATA',
669+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/RECORD',
670+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/WHEEL',
671+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/metadata.json',
672+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/top_level.txt',
673673
])
674674

675675
# bazel-bin/testdata/py_image_complex.1-layer.tar
676676
self.assertLayerNContains(img, 6, [
677677
'.',
678678
'./app',
679-
'./app/pip_deps_pypi__six_1_11_0',
680-
'./app/pip_deps_pypi__six_1_11_0/six.py',
681-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info',
682-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/DESCRIPTION.rst',
683-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/METADATA',
684-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/RECORD',
685-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/WHEEL',
686-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/metadata.json',
687-
'./app/pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/top_level.txt',
679+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0',
680+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six.py',
681+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info',
682+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/DESCRIPTION.rst',
683+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/METADATA',
684+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/RECORD',
685+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/WHEEL',
686+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/metadata.json',
687+
'./app/io_bazel_rules_docker_pip_deps_pypi__six_1_11_0/six-1.11.0.dist-info/top_level.txt',
688688
])
689689

690690

@@ -694,34 +694,34 @@ def test_py_image_complex(self):
694694
'/app',
695695
'/app/testdata',
696696
'/app/testdata/py_image_complex.binary.runfiles',
697-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2',
698-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict',
699-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict/__init__.py',
700-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict/addict.py',
701-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info',
702-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/DESCRIPTION.rst',
703-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/METADATA',
704-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/RECORD',
705-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/WHEEL',
706-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/metadata.json',
707-
'/app/testdata/py_image_complex.binary.runfiles/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/top_level.txt',
697+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2',
698+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict',
699+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict/__init__.py',
700+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict/addict.py',
701+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info',
702+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/DESCRIPTION.rst',
703+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/METADATA',
704+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/RECORD',
705+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/WHEEL',
706+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/metadata.json',
707+
'/app/testdata/py_image_complex.binary.runfiles/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/top_level.txt',
708708
])
709709

710710
# bazel-bin/testdata/py_image_complex.0-layer.tar
711711
self.assertLayerNContains(img, 8, [
712712
'.',
713713
'./app',
714-
'./app/pip_deps_pypi__addict_2_1_2',
715-
'./app/pip_deps_pypi__addict_2_1_2/addict',
716-
'./app/pip_deps_pypi__addict_2_1_2/addict/__init__.py',
717-
'./app/pip_deps_pypi__addict_2_1_2/addict/addict.py',
718-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info',
719-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/DESCRIPTION.rst',
720-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/METADATA',
721-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/RECORD',
722-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/WHEEL',
723-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/metadata.json',
724-
'./app/pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/top_level.txt',
714+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2',
715+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict',
716+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict/__init__.py',
717+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict/addict.py',
718+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info',
719+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/DESCRIPTION.rst',
720+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/METADATA',
721+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/RECORD',
722+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/WHEEL',
723+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/metadata.json',
724+
'./app/io_bazel_rules_docker_pip_deps_pypi__addict_2_1_2/addict-2.1.2.dist-info/top_level.txt',
725725
])
726726

727727
def test_java_image(self):

‎repositories/pip_repositories.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Provides functions to pull all Python external package dependencies of this
1919
repository.
2020
"""
2121

22-
load("@pip_deps//:requirements.bzl", "pip_install")
22+
load("@io_bazel_rules_docker_pip_deps//:requirements.bzl", "pip_install")
2323

24-
def pip_deps():
24+
def io_bazel_rules_docker_pip_deps():
2525
"""Pull in external pip packages needed by py binaries in this repo.
2626
2727
Pull in all pip dependencies needed to build the Py binaries in this

‎repositories/py_repositories.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ def py_deps():
3030
already.
3131
"""
3232
excludes = native.existing_rules().keys()
33-
if "pip_deps" not in excludes:
33+
if "io_bazel_rules_docker_pip_deps" not in excludes:
3434
pip_repositories()
3535

3636
pip_import(
37-
name = "pip_deps",
37+
name = "io_bazel_rules_docker_pip_deps",
3838
requirements = "@io_bazel_rules_docker//repositories:requirements-pip.txt",
3939
)

‎testdata/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
1616
load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
17+
load("@io_bazel_rules_docker_pip_deps//:requirements.bzl", "requirement")
1718
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
1819
load("@npm//@bazel/typescript:index.bzl", "ts_library")
19-
load("@pip_deps//:requirements.bzl", "requirement")
2020
load("@rules_pkg//:pkg.bzl", "pkg_tar")
2121
load("//cc:image.bzl", "cc_image")
2222
load(

‎testdata/test/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
load("@io_bazel_rules_docker//python3:image.bzl", "py3_image")
16-
load("@pip_deps//:requirements.bzl", "all_requirements", "requirement")
16+
load("@io_bazel_rules_docker_pip_deps//:requirements.bzl", "all_requirements", "requirement")
1717

1818
package(default_visibility = ["//testdata:__subpackages__"])
1919

0 commit comments

Comments
 (0)