Replace rules_pip with rules_python; use bazel built upstream grpc
instead of Python packages
As usual with Python sadness, the @pydeps wheels are built on the bazel
host, so stuffing them inside a container_image (or py_image) will cause
new and unexpected kinds of misery.
Change-Id: Id4e4d53741cf2da367f01aa15c21c133c5cf0dba
diff --git a/personal/q3k/BUILD b/personal/q3k/BUILD
index 99e661d..8317e7c 100644
--- a/personal/q3k/BUILD
+++ b/personal/q3k/BUILD
@@ -1,7 +1,9 @@
+load("@pydeps//:requirements.bzl", "requirement")
+
py_binary(
name = "django-admin",
srcs = ["django-admin.py"],
deps = [
- "@pydeps36//django",
+ requirement("django"),
]
)
diff --git a/personal/q3k/djtest/BUILD b/personal/q3k/djtest/BUILD
index b3a2cad..d4ab6cc 100644
--- a/personal/q3k/djtest/BUILD
+++ b/personal/q3k/djtest/BUILD
@@ -1,8 +1,11 @@
+load("@pydeps//:requirements.bzl", "requirement")
+
py_library(
name = "app",
srcs = glob(["djtest/**/*.py"]),
deps = [
- "@pydeps//django",
+ requirement("django"),
+ requirement("sqlparse"),
],
)
@@ -20,8 +23,6 @@
deps = [
":app",
"@bazel_tools//tools/python/runfiles",
- ],
- data = [
- '@pip__uWSGI_2_0_18_cp36_cp36m_linux_x86_64//scripts:uwsgi',
+ requirement("uwsgi"),
],
)
diff --git a/personal/q3k/djtest/uwsgi-start.py b/personal/q3k/djtest/uwsgi-start.py
index 0edcdaf..eb22d55 100644
--- a/personal/q3k/djtest/uwsgi-start.py
+++ b/personal/q3k/djtest/uwsgi-start.py
@@ -9,7 +9,7 @@
from bazel_tools.tools.python.runfiles import runfiles
r = runfiles.Create()
-uwsgi = r.Rlocation("pip__uWSGI_2_0_18_cp36_cp36m_linux_x86_64/scripts/uwsgi")
+uwsgi = r.Rlocation("pydeps_pypi__uWSGI_2_0_18/uWSGI-2.0.18.data/scripts/uwsgi")
print(uwsgi)
settings = r.Rlocation("hscloud/personal/q3k/djtest/djtest/settings.py")
print(settings)