Skip to content

Commit 046f495

Browse files
sjonnalagaddaSridhar
authored and
Sridhar
committed
issue: 882
Upgrading rules_python version and fixed a regression test issue
1 parent 447fb8e commit 046f495

File tree

8 files changed

+35
-6
lines changed

8 files changed

+35
-6
lines changed

Diff for: MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module(
77

88
# Do not update to newer versions until you need a specific new feature.
99
bazel_dep(name = "rules_license", version = "0.0.7")
10-
bazel_dep(name = "rules_python", version = "0.31.0")
10+
bazel_dep(name = "rules_python", version = "0.34.0")
1111
bazel_dep(name = "bazel_skylib", version = "1.4.2")
1212

1313
# Only for development

Diff for: distro/packaging_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ def testBuild(self):
7272
'file://%s' % local_path, self.source_repo, sha256,
7373
rename_repo=self.dest_repo,
7474
deps_method='rules_pkg_dependencies'
75-
)
75+
),
76+
release_tools.rules_python_internal_content()
7677
))
7778
workspace.write(workspace_content)
7879
if _VERBOSE:
@@ -90,7 +91,6 @@ def CopyTestFile(source_name, dest_name):
9091
out.write(content)
9192

9293
CopyTestFile('BUILD.tpl', 'BUILD')
93-
9494
os.chdir(tempdir)
9595
build_result = subprocess.check_output(['bazel', 'build', ':dummy_tar'])
9696
if _VERBOSE:

Diff for: examples/naming_package_files/WORKSPACE

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ local_repository(
2424
load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
2525

2626
rules_pkg_dependencies()
27+
load("@rules_python//:internal_deps.bzl", "rules_python_internal_deps")
28+
rules_python_internal_deps()
29+
load("@rules_python//:internal_setup.bzl", "rules_python_internal_setup")
30+
rules_python_internal_setup()
2731

2832
http_archive(
2933
name = "rules_cc",

Diff for: examples/naming_package_files/WORKSPACE.bzlmod

+8
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ local_repository(
66
load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
77

88
rules_pkg_dependencies()
9+
10+
load("@rules_python//:internal_deps.bzl", "rules_python_internal_deps")
11+
12+
rules_python_internal_deps()
13+
14+
load("@rules_python//:internal_setup.bzl", "rules_python_internal_setup")
15+
16+
rules_python_internal_setup()

Diff for: examples/rich_structure/WORKSPACE

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
2525

2626
rules_pkg_dependencies()
2727

28+
load("@rules_python//:internal_deps.bzl", "rules_python_internal_deps")
29+
rules_python_internal_deps()
30+
load("@rules_python//:internal_setup.bzl", "rules_python_internal_setup")
31+
rules_python_internal_setup()
32+
2833
http_archive(
2934
name = "rules_cc",
3035
sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",

Diff for: examples/time_stamping/WORKSPACE

+5
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ local_repository(
2222
load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
2323

2424
rules_pkg_dependencies()
25+
26+
load("@rules_python//:internal_deps.bzl", "rules_python_internal_deps")
27+
rules_python_internal_deps()
28+
load("@rules_python//:internal_setup.bzl", "rules_python_internal_setup")
29+
rules_python_internal_setup()

Diff for: pkg/deps.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ def rules_pkg_dependencies():
4141

4242
http_archive(
4343
name = "rules_python",
44-
sha256 = "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578",
45-
strip_prefix = "rules_python-0.24.0",
46-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz",
44+
sha256 = "778aaeab3e6cfd56d681c89f5c10d7ad6bf8d2f1a72de9de55b23081b2d31618",
45+
strip_prefix = "rules_python-0.34.0",
46+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
4747
)
4848

4949
http_archive(

Diff for: pkg/releasing/release_tools.py

+7
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,10 @@ def workspace_content(
101101
ret += '%s()\n' % m
102102

103103
return ret
104+
105+
def rules_python_internal_content():
106+
ret = 'load("@rules_python//:internal_deps.bzl", "rules_python_internal_deps")'
107+
ret += '\n\nrules_python_internal_deps()\n'
108+
ret += 'load("@rules_python//:internal_setup.bzl", "rules_python_internal_setup")'
109+
ret += '\n\nrules_python_internal_setup()\n'
110+
return ret

0 commit comments

Comments
 (0)