Lint

bzlmodRio · Jul 9, 2023 · dacfd46 · dacfd46
1 parent ed81ee0
commit dacfd46
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 80 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -99,8 +99,8 @@ load("@rules_python//python:repositories.bzl", "python_register_toolchains")
 
 python_register_toolchains(
     name = "python3_10",
-    python_version = "3.10.6",
     ignore_root_user_error = True,
+    python_version = "3.10.6",
 )
 
 load("@python3_10//:defs.bzl", "interpreter")

diff --git a/hal/src/test/python/BUILD.bazel b/hal/src/test/python/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_python//python:defs.bzl", "py_test")
 load("@allwpilib_pip_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
 
 SOURCES = glob(["test_*.py"])
 

diff --git a/ntcore/src/test/python/BUILD.bazel b/ntcore/src/test/python/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@allwpilib_pip_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
 
 SOURCES = glob(["test_*.py"])
 

diff --git a/shared/bazel/rules/python/pybind_generator/BUILD.bazel b/shared/bazel/rules/python/pybind_generator/BUILD.bazel
@@ -64,7 +64,10 @@ py_binary(
 
 cc_library(
     name = "robotpy_includes",
-    hdrs = ["robotpy_build.h", "pybind11_typing.h"],
+    hdrs = [
+        "pybind11_typing.h",
+        "robotpy_build.h",
+    ],
     strip_include_prefix = ".",
     visibility = ["//visibility:public"],
 )
diff --git a/shared/bazel/rules/python/pybind_generator/private/create_robotpy_project.bzl b/shared/bazel/rules/python/pybind_generator/private/create_robotpy_project.bzl
@@ -2,8 +2,8 @@
 Creates helper tools for a robotpy pybind project
 """
 
-load("@rules_python//python:defs.bzl", "py_binary")
 load("@allwpilib_pip_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_binary")
 
 def create_robotpy_project(name):
     py_binary(

diff --git a/shared/bazel/rules/python/pybind_generator/private/generate_robotpy_package.bzl b/shared/bazel/rules/python/pybind_generator/private/generate_robotpy_package.bzl
@@ -1,5 +1,5 @@
-load("//shared/bazel/rules/python/pybind_generator/private:magic_directories.bzl", "GENERATED_INIT_DIR", "GENERATED_PKG_CONFIG_DIR", "GENERATED_PYBIND_DIR")
 load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+load("//shared/bazel/rules/python/pybind_generator/private:magic_directories.bzl", "GENERATED_INIT_DIR", "GENERATED_PKG_CONFIG_DIR", "GENERATED_PYBIND_DIR")
 
 def generate_robotpy_package(
         name,

diff --git a/shared/bazel/rules/python/pybind_generator/python_wrapper.bzl b/shared/bazel/rules/python/pybind_generator/python_wrapper.bzl
@@ -1,7 +1,7 @@
-load("//shared/bazel/rules/python/pybind_generator/private:create_robotpy_project.bzl", _create_robotpy_project = "create_robotpy_project")
-load("//shared/bazel/rules/python/pybind_generator/private:generate_robotpy_package.bzl", _generate_robotpy_package = "generate_robotpy_package")
 load("//shared/bazel/rules/python/pybind_generator/private:create_pybind_library.bzl", "create_pybind_library")
+load("//shared/bazel/rules/python/pybind_generator/private:create_robotpy_project.bzl", _create_robotpy_project = "create_robotpy_project")
 load("//shared/bazel/rules/python/pybind_generator/private:generate_init_files.bzl", _generate_init_files = "generate_init_files")
+load("//shared/bazel/rules/python/pybind_generator/private:generate_robotpy_package.bzl", _generate_robotpy_package = "generate_robotpy_package")
 
 create_robotpy_project = _create_robotpy_project
 generate_robotpy_package = _generate_robotpy_package

diff --git a/wpilibc/src/main/native/BUILD.bazel b/wpilibc/src/main/native/BUILD.bazel
@@ -3,7 +3,10 @@ load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_static_and_shared_library")
 filegroup(
     name = "headers",
     srcs = glob(["include/**/*"]),
-    visibility = ["//wpilibc:__subpackages__", "//wpilibpy:__subpackages__"],
+    visibility = [
+        "//wpilibc:__subpackages__",
+        "//wpilibpy:__subpackages__",
+    ],
 )
 
 wpilib_cc_static_and_shared_library(

diff --git a/wpilibpy/src/main/python/BUILD.bazel b/wpilibpy/src/main/python/BUILD.bazel
@@ -1,4 +1,5 @@
-load("//shared/bazel/rules/python/pybind_generator:python_wrapper.bzl", "create_robotpy_project", "generate_robotpy_package", "create_python_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
+load("//shared/bazel/rules/python/pybind_generator:python_wrapper.bzl", "create_python_library", "create_robotpy_project", "generate_robotpy_package")
 load("//shared/bazel/rules/python/pybind_generator/private:magic_directories.bzl", "GENERATED_PYBIND_DIR")
 
 create_robotpy_project(name = "wpilibpy")
@@ -113,7 +114,6 @@ WPILIBPY_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilib_core/Watchdog.cpp",
     "pybind_gen/wpilib_core/XboxController.cpp",
     "pybind_gen/wpilib_core/rpygen_wrapper.hpp",
-
     "wpilibpy/rpygen/frc__ADIS16448_IMU.hpp",
     "wpilibpy/rpygen/frc__ADIS16470_IMU.hpp",
     "wpilibpy/rpygen/frc__ADXL345_I2C.hpp",
@@ -198,8 +198,6 @@ WPILIBPY_COUNTER_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilibc_counter/Tachometer.cpp",
     "pybind_gen/wpilibc_counter/UpDownCounter.cpp",
     "pybind_gen/wpilibc_counter/rpygen_wrapper.hpp",
-
-
     "wpilibpy/counter/rpygen/frc__ExternalDirectionCounter.hpp",
     "wpilibpy/counter/rpygen/frc__Tachometer.hpp",
     "wpilibpy/counter/rpygen/frc__UpDownCounter.hpp",
@@ -218,7 +216,6 @@ WPILIBPY_DRIVE_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilibc_drive/MecanumDrive.cpp",
     "pybind_gen/wpilibc_drive/RobotDriveBase.cpp",
     "pybind_gen/wpilibc_drive/rpygen_wrapper.hpp",
-
     "wpilibpy/drive/rpygen/frc__DifferentialDrive.hpp",
     "wpilibpy/drive/rpygen/frc__MecanumDrive.hpp",
     "wpilibpy/drive/rpygen/frc__RobotDriveBase.hpp",
@@ -254,7 +251,6 @@ WPILIBPY_INTERFACES_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilibc_interfaces/Gyro.cpp",
     "pybind_gen/wpilibc_interfaces/MotorController.cpp",
     "pybind_gen/wpilibc_interfaces/rpygen_wrapper.hpp",
-
     "wpilibpy/interfaces/rpygen/frc__Accelerometer.hpp",
     "wpilibpy/interfaces/rpygen/frc__CounterBase.hpp",
     "wpilibpy/interfaces/rpygen/frc__GenericHID.hpp",
@@ -331,8 +327,6 @@ WPILIBPY_SHUFFLEBOARD_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilibc_shuffleboard/SuppliedValueWidget_tmpl9.cpp",
     "pybind_gen/wpilibc_shuffleboard/WidgetType.cpp",
     "pybind_gen/wpilibc_shuffleboard/rpygen_wrapper.hpp",
-
-
     "wpilibpy/shuffleboard/rpygen/frc__ShuffleboardComponent.hpp",
     "wpilibpy/shuffleboard/rpygen/frc__ShuffleboardRoot.hpp",
     "wpilibpy/shuffleboard/rpygen/frc__ShuffleboardWidget.hpp",
@@ -399,8 +393,6 @@ WPILIBPY_SIMULATION_GENERATED_PYBIND_FILES = [
     "pybind_gen/wpilibc_simulation/UltrasonicSim.cpp",
     "pybind_gen/wpilibc_simulation/XboxControllerSim.cpp",
     "pybind_gen/wpilibc_simulation/rpygen_wrapper.hpp",
-
-
     "wpilibpy/simulation/rpygen/frc__sim__CTREPCMSim.hpp",
     "wpilibpy/simulation/rpygen/frc__sim__DCMotorSim.hpp",
     "wpilibpy/simulation/rpygen/frc__sim__ElevatorSim.hpp",
@@ -438,44 +430,48 @@ generate_robotpy_package(
     ],
 )
 
-
 cc_library(
     name = "wpilibc_impl",
-    deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
-        "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
-        "//wpimath/src/main/python:wpimath_cpp",
-        "//ntcore/src/main/python:_ntcore",
-    ],
-    srcs = glob([ "wpilib/src/**"]),
+    srcs = glob(["wpilib/src/**"]),
+    copts = ["-Wno-deprecated"],
     includes = [
         "wpilib",
         "wpilib/src",
         "wpilib/src/rpy",
     ],
-    copts = ["-Wno-deprecated"],
+    deps = [
+        "//hal/src/main/python:_wpiHal",
+        "//ntcore/src/main/python:_ntcore",
+        "//wpilibc/src/main/native:wpilibc.shared",
+        "//wpimath/src/main/python:wpimath_cpp",
+        "//wpiutil/src/main/python:_wpiutil",
+    ],
 )
 
 #wpilibpy/src/main/python/wpilibpy/rpygen/frc__ADIS16448_IMU.hpp
 #wpilibpy/src/main/python/wpilibpy/src/main/python/wpilibpy
 create_python_library(
     name = "wpilib_core",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
+        ":_event",
+        ":_interfaces",
+        ":wpilibc_impl",
         "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
         "//ntcore/src/main/python:_ntcore",
-        "//wpimath/src/main/python:wpimath_cpp",
-        "//wpimath/src/main/python:_geometry",
+        "//wpilibc/src/main/native:wpilibc.shared",
         "//wpimath/src/main/python:_controls",
-        ":wpilibc_impl",
-        ":_interfaces",
-        ":_event",
+        "//wpimath/src/main/python:_geometry",
+        "//wpimath/src/main/python:wpimath_cpp",
+        "//wpiutil/src/main/python:_wpiutil",
     ],
     generated_pybind_files = WPILIBPY_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    inter_package_pybind_deps = [":_interfaces.so"],
+    pybind_extra_include_strip = [
+        "wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy",
+    ],
     pybind_extra_includes = [
         "wpilibpy/src",
         "wpilibpy/src/main/python/wpilib",
@@ -488,75 +484,73 @@ create_python_library(
         "wpilib/src/rpy/SmartDashboardData.cpp",
         "wpilib/src/rpy/MotorControllerGroup.cpp",
     ],
-    pybind_extra_include_strip = [
-        "wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy",
-    ],
     pybind_main = "wpilib/src/main.cpp",
     python_deps = [
     ],
     python_subpackages = WPILIBPY_PYTHON_PACKAGES,
-    inter_package_pybind_deps = [":_interfaces.so"],
 )
 
 create_python_library(
     name = "counter",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
-        ":_wpilib_core",
         ":_interfaces",
+        ":_wpilib_core",
         "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
         "//ntcore/src/main/python:_ntcore",
+        "//wpilibc/src/main/native:wpilibc.shared",
+        "//wpiutil/src/main/python:_wpiutil",
     ],
     full_gen_name = "wpilibc_counter",
     generated_pybind_files = WPILIBPY_COUNTER_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    pybind_extra_include_strip = [
+        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy/counter",
+    ],
     pybind_extra_includes = ["wpilibc/src/main/native/include"],
     pybind_extra_srcs = [],
     pybind_main = "wpilib/counter/counter.cpp",
     python_deps = [
     ],
     python_subpackages = WPILIBPY_COUNTER_PYTHON_PACKAGES,
-    pybind_extra_include_strip = [
-        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy/counter",
-    ],
 )
 
 create_python_library(
     name = "drive",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
         ":_wpilib_core",
+        "//wpilibc/src/main/native:wpilibc.shared",
     ],
     full_gen_name = "wpilibc_drive",
     generated_pybind_files = WPILIBPY_DRIVE_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    inter_package_pybind_deps = [
+        ":_wpilib_core.so",
+        ":_interfaces.so",
+    ],
+    pybind_extra_include_strip = [
+        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy/drive",
+    ],
     pybind_extra_includes = ["wpilibc/src/main/native/include"],
     pybind_extra_srcs = [],
     pybind_main = "wpilib/drive/drive.cpp",
     python_deps = [
     ],
     python_subpackages = WPILIBPY_DRIVE_PYTHON_PACKAGES,
-    pybind_extra_include_strip = [
-        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy/drive",
-    ],
-    inter_package_pybind_deps = [":_wpilib_core.so", ":_interfaces.so"],
 )
 
 create_python_library(
     name = "event",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
         "//hal/src/main/python:_wpiHal",
+        "//ntcore/src/main/python:_ntcore",
+        "//wpilibc/src/main/native:wpilibc.shared",
         "//wpimath/src/main/python:_filter",
         "//wpimath/src/main/python:wpimath_cpp",
         "//wpiutil/src/main/python:_wpiutil",
-        "//ntcore/src/main/python:_ntcore",
     ],
     full_gen_name = "wpilibc_event",
     generated_pybind_files = WPILIBPY_EVENT_GENERATED_PYBIND_FILES,
@@ -573,44 +567,49 @@ create_python_library(
 create_python_library(
     name = "interfaces",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
         ":_event",
         "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
         "//ntcore/src/main/python:_ntcore",
-        "//wpimath/src/main/python:wpimath_cpp",
+        "//wpilibc/src/main/native:wpilibc.shared",
         "//wpimath/src/main/python:_geometry",
+        "//wpimath/src/main/python:wpimath_cpp",
+        "//wpiutil/src/main/python:_wpiutil",
     ],
     full_gen_name = "wpilibc_interfaces",
     generated_pybind_files = WPILIBPY_INTERFACES_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    pybind_extra_include_strip = [
+        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy/interfaces",
+    ],
     pybind_extra_includes = ["wpilibc/src/main/native/include"],
     pybind_extra_srcs = [],
     pybind_main = "wpilib/interfaces/interfaces.cpp",
     python_deps = [
     ],
     python_subpackages = WPILIBPY_INTERFACES_PYTHON_PACKAGES,
-    pybind_extra_include_strip = [
-        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy/interfaces",
-    ],
 )
 
 create_python_library(
     name = "shuffleboard",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
-        ":_wpilib_core",
         ":_interfaces",
+        ":_wpilib_core",
         "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
         "//ntcore/src/main/python:_ntcore",
+        "//wpilibc/src/main/native:wpilibc.shared",
+        "//wpiutil/src/main/python:_wpiutil",
     ],
     full_gen_name = "wpilibc_shuffleboard",
     generated_pybind_files = WPILIBPY_SHUFFLEBOARD_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    pybind_extra_include_strip = [
+        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy/shuffleboard",
+        "wpilib/shuffleboard/",
+    ],
     pybind_extra_includes = ["wpilibc/src/main/native/include"],
     pybind_extra_srcs = [
         "wpilib/shuffleboard/ShuffleboardData.cpp",
@@ -620,38 +619,32 @@ create_python_library(
     python_deps = [
     ],
     python_subpackages = WPILIBPY_SHUFFLEBOARD_PYTHON_PACKAGES,
-    pybind_extra_include_strip = [
-        #"wpilibpy/src/main/python/_GeneratedPybind/wpilibpy",
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy/shuffleboard",
-        "wpilib/shuffleboard/",
-    ],
 )
 
 create_python_library(
     name = "simulation",
     cc_deps = [
-        "//wpilibc/src/main/native:wpilibc.shared",
         ":_wpilib_core",
         "//hal/src/main/python:_wpiHal",
-        "//wpiutil/src/main/python:_wpiutil",
-        "//wpimath/src/main/python:wpimath_cpp",
+        "//ntcore/src/main/python:_ntcore",
+        "//wpilibc/src/main/native:wpilibc.shared",
         "//wpimath/src/main/python:_controls",
         "//wpimath/src/main/python:_geometry",
         "//wpimath/src/main/python:_kinematics",
-        "//ntcore/src/main/python:_ntcore",
+        "//wpimath/src/main/python:wpimath_cpp",
+        "//wpiutil/src/main/python:_wpiutil",
     ],
     full_gen_name = "wpilibc_simulation",
     generated_pybind_files = WPILIBPY_SIMULATION_GENERATED_PYBIND_FILES,
     generator_name = "wpilibpy.generate_pybind",
     headers = "//wpilibpy/src/main/native:headers",
+    pybind_extra_include_strip = [
+        GENERATED_PYBIND_DIR + "/" + "wpilibpy/simulation",
+    ],
     pybind_extra_includes = ["wpilibc/src/main/native/include"],
     pybind_extra_srcs = [],
     pybind_main = "wpilib/simulation/simulation.cpp",
     python_deps = [
     ],
     python_subpackages = WPILIBPY_SIMULATION_PYTHON_PACKAGES,
-    pybind_extra_include_strip = [
-        GENERATED_PYBIND_DIR + "/" + "wpilibpy/simulation",
-    ],
 )
-