Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move python dep to upstream rules_python #67

Merged
merged 2 commits into from
Nov 2, 2023
Merged

Move python dep to upstream rules_python #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51aab9b
Move python dep to upstream rules_python
mjcarroll Nov 2, 2023
3eb5905
Lint
mjcarroll Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lint/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package(default_visibility = ["//visibility:public"])

load("@gz//bazel/lint:lint.bzl", "add_lint_tests")
load(
"@gz//bazel/skylark:gz_py.bzl",
"@gz//bazel/skylark:build_defs.bzl",
"add_lint_tests",
"gz_py_binary",
"gz_py_library",
"gz_py_unittest",
)

package(default_visibility = ["//visibility:public"])

gz_py_library(
name = "find_data",
srcs = ["find_data.py"],
Expand Down
6 changes: 3 additions & 3 deletions lint/bazel_lint.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# vi: set ft=python :

load("@gz//bazel/skylark:gz_py.bzl", "py_test_isolated")
load("@rules_python//python:defs.bzl", "py_test")

#------------------------------------------------------------------------------
# Internal helper; set up test given name and list of files. Will do nothing
Expand All @@ -17,7 +17,7 @@ def _bazel_lint(name, files, ignore):
ignores_as_arg = ["--ignore=" + ",".join(ignores)]
locations = ["$(locations %s)" % f for f in files]

py_test_isolated(
py_test(
name = name + "_codestyle",
size = "small",
srcs = ["@gz//bazel/lint:bzlcodestyle"],
Expand All @@ -27,7 +27,7 @@ def _bazel_lint(name, files, ignore):
tags = ["bzlcodestyle", "lint"],
)

py_test_isolated(
py_test(
name = name + "_buildifier",
size = "small",
srcs = ["@gz//bazel/lint:buildifier"],
Expand Down
8 changes: 1 addition & 7 deletions skylark/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# -*- python -*-

load("@gz//bazel/skylark:gz_py.bzl", "gz_py_binary")

# Used by :python_env.bzl.
config_setting(
name = "linux",
values = {"cpu": "k8"},
)
load(":build_defs.bzl", "gz_py_binary")

gz_py_binary(
name = "gz_configure_file",
Expand Down
1 change: 1 addition & 0 deletions skylark/build_defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ GZ_FEATURES = [

cmake_configure_file = _cmake_configure_file
gz_configure_header = _gz_configure_header
gz_configure_file = _gz_configure_header
gz_export_header = _gz_export_header
gz_include_header = _gz_include_header
add_lint_tests = _add_lint_tests
Expand Down