Skip to content

Commit de1504e

Browse files
committed
Move and merge python requirements files
1 parent 2f8dc7e commit de1504e

File tree

13 files changed

+22
-25
lines changed

13 files changed

+22
-25
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
8787

8888
http_archive(
8989
name = "rules_proto_grpc",
90-
urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/36068e46a785c2cbadc87ca229e0a439e25a0694.tar.gz"],
90+
urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/2f8dc7ea58d6c79471bfc876f8e46c20449e0c6c.tar.gz"],
9191
sha256 = "395408a3dc9c3db2b5c200b8722a13a60898c861633b99e6e250186adffd1370",
92-
strip_prefix = "rules_proto_grpc-36068e46a785c2cbadc87ca229e0a439e25a0694",
92+
strip_prefix = "rules_proto_grpc-2f8dc7ea58d6c79471bfc876f8e46c20449e0c6c",
9393
)
9494

9595
load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains")

WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
216216
pip_repository(
217217
name = "grpc_py2_deps",
218218
python_interpreter = "python2",
219-
requirements = "//python/requirements:grpc.txt",
219+
requirements = "//python:requirements.txt",
220220
)
221221
pip_repository(
222222
name = "grpc_py3_deps",
223223
python_interpreter = "python3",
224-
requirements = "//python/requirements:grpc.txt",
224+
requirements = "//python:requirements.txt",
225225
)
226226

227227

example/python/python_grpc_library/WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2323
pip_repository(
2424
name = "grpc_py2_deps",
2525
python_interpreter = "python2",
26-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
26+
requirements = "@rules_proto_grpc//python:requirements.txt",
2727
)
2828

2929
pip_repository(
3030
name = "grpc_py3_deps",
3131
python_interpreter = "python3",
32-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
32+
requirements = "@rules_proto_grpc//python:requirements.txt",
3333
)

example/python/python_grpclib_compile/WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2323
pip_repository(
2424
name = "grpc_py2_deps",
2525
python_interpreter = "python2",
26-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
26+
requirements = "@rules_proto_grpc//python:requirements.txt",
2727
)
2828

2929
pip_repository(
3030
name = "grpc_py3_deps",
3131
python_interpreter = "python3",
32-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
32+
requirements = "@rules_proto_grpc//python:requirements.txt",
3333
)

example/python/python_grpclib_library/WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2323
pip_repository(
2424
name = "grpc_py2_deps",
2525
python_interpreter = "python2",
26-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
26+
requirements = "@rules_proto_grpc//python:requirements.txt",
2727
)
2828

2929
pip_repository(
3030
name = "grpc_py3_deps",
3131
python_interpreter = "python3",
32-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
32+
requirements = "@rules_proto_grpc//python:requirements.txt",
3333
)

python/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
105105
pip_repository(
106106
name = "grpc_py2_deps",
107107
python_interpreter = "python2",
108-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
108+
requirements = "@rules_proto_grpc//python:requirements.txt",
109109
)
110110

111111
pip_repository(
112112
name = "grpc_py3_deps",
113113
python_interpreter = "python3",
114-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
114+
requirements = "@rules_proto_grpc//python:requirements.txt",
115115
)
116116
```
117117

@@ -191,13 +191,13 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
191191
pip_repository(
192192
name = "grpc_py2_deps",
193193
python_interpreter = "python2",
194-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
194+
requirements = "@rules_proto_grpc//python:requirements.txt",
195195
)
196196

197197
pip_repository(
198198
name = "grpc_py3_deps",
199199
python_interpreter = "python3",
200-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
200+
requirements = "@rules_proto_grpc//python:requirements.txt",
201201
)
202202
```
203203

@@ -246,13 +246,13 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
246246
pip_repository(
247247
name = "grpc_py2_deps",
248248
python_interpreter = "python2",
249-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
249+
requirements = "@rules_proto_grpc//python:requirements.txt",
250250
)
251251

252252
pip_repository(
253253
name = "grpc_py3_deps",
254254
python_interpreter = "python3",
255-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
255+
requirements = "@rules_proto_grpc//python:requirements.txt",
256256
)
257257
```
258258

File renamed without changes.

python/requirements/BUILD.bazel

Whitespace-only changes.

python/requirements/protobuf.txt

-3
This file was deleted.

test_workspaces/python2_grpc/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2020
pip_repository(
2121
name = "grpc_py2_deps",
2222
python_interpreter = "python",
23-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
23+
requirements = "@rules_proto_grpc//python:requirements.txt",
2424
)

test_workspaces/python3_grpc/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2020
pip_repository(
2121
name = "grpc_py3_deps",
2222
python_interpreter = "python3",
23-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
23+
requirements = "@rules_proto_grpc//python:requirements.txt",
2424
)

test_workspaces/python_deps/WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
2020
pip_repository(
2121
name = "grpc_py2_deps",
2222
python_interpreter = "python2",
23-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
23+
requirements = "@rules_proto_grpc//python:requirements.txt",
2424
)
2525

2626
pip_repository(
2727
name = "grpc_py3_deps",
2828
python_interpreter = "python3",
29-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
29+
requirements = "@rules_proto_grpc//python:requirements.txt",
3030
)

tools/rulegen/python.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ load("@com_apt_itude_rules_pip//rules:repository.bzl", "pip_repository")
1717
pip_repository(
1818
name = "grpc_py2_deps",
1919
python_interpreter = "python2",
20-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
20+
requirements = "@rules_proto_grpc//python:requirements.txt",
2121
)
2222
2323
pip_repository(
2424
name = "grpc_py3_deps",
2525
python_interpreter = "python3",
26-
requirements = "@rules_proto_grpc//python/requirements:grpc.txt",
26+
requirements = "@rules_proto_grpc//python:requirements.txt",
2727
)`)
2828

2929
var pythonProtoLibraryRuleTemplate = mustTemplate(`load("//{{ .Lang.Dir }}:{{ .Lang.Name }}_{{ .Rule.Kind }}_compile.bzl", "{{ .Lang.Name }}_{{ .Rule.Kind }}_compile")

0 commit comments

Comments
 (0)