diff --git a/justfile b/justfile index bbf6f7547..d089aa340 100644 --- a/justfile +++ b/justfile @@ -50,21 +50,56 @@ run-test-matrix: done run-test-pytest: - python -m pytest -v --cov={{justfile_directory()}} --cov-report html tests/pytest + python -m pytest -v --cov={{ justfile_directory() }} --cov-report html tests/pytest run-test-bats: ./tests/bats/run_bats.sh gen-constants: && fmt - ./scripts/gen_constants.py > src/gallia/transports/_can_constants.py + #!/usr/bin/env python + + import socket + + TEMPLATE = f"""# This file has been autogenerated by `just gen-constants`. + # !! DO NOT CHANGE MANUALLY !! + + import struct + + + CANFD_MTU = 72 + CAN_MTU = 16 + + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/can.h + CAN_HEADER_FMT = struct.Struct("=IBB2x") + + CANFD_BRS = 0x01 + CANFD_ESI = 0x02 + + CAN_EFF_FLAG = {socket.CAN_EFF_FLAG} + CAN_ERR_FLAG = {socket.CAN_ERR_FLAG} + CAN_RTR_FLAG = {socket.CAN_RTR_FLAG} + + CAN_EFF_MASK = {socket.CAN_EFF_MASK} + CAN_INV_FILTER = 0x20000000 # TODO: Add to CPython + CAN_SFF_MASK = {socket.CAN_SFF_MASK} + + CAN_RAW = {socket.CAN_RAW} + CAN_RAW_FD_FRAMES = {socket.CAN_RAW_FD_FRAMES} + CAN_RAW_FILTER = {socket.CAN_RAW_FILTER} + CAN_RAW_JOIN_FILTERS = {socket.CAN_RAW_JOIN_FILTERS} + SOL_CAN_RAW = {socket.SOL_CAN_RAW} + """ + + with open("src/gallia/transports/_can_constants.py", "w") as f: + f.write(TEMPLATE) release increment: - cz bump --increment {{increment}} + cz bump --increment {{ increment }} git push --follow-tags gh release create "v$(cz version -p)" pre-release increment premode: - cz bump --increment {{increment}} --prerelease {{premode}} + cz bump --increment {{ increment }} --prerelease {{ premode }} git push --follow-tags gh release create --prerelease "v$(cz version -p)" diff --git a/scripts/gen_constants.py b/scripts/gen_constants.py deleted file mode 100755 index 23f99cc99..000000000 --- a/scripts/gen_constants.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python - -# SPDX-FileCopyrightText: AISEC Pentesting Team -# -# SPDX-License-Identifier: Apache-2.0 - -import socket - -TEMPLATE = f"""# This file has been autogenerated by `make constants`. -# !! DO NOT CHANGE MANUALLY !! - -# SPDX-FileCopyrightText: AISEC Pentesting Team -# -# SPDX-License-Identifier: Apache-2.0 - -import struct - - -CANFD_MTU = 72 -CAN_MTU = 16 - -# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/can.h -CAN_HEADER_FMT = struct.Struct("=IBB2x") - -CANFD_BRS = 0x01 -CANFD_ESI = 0x02 - -CAN_EFF_FLAG = {socket.CAN_EFF_FLAG} -CAN_ERR_FLAG = {socket.CAN_ERR_FLAG} -CAN_RTR_FLAG = {socket.CAN_RTR_FLAG} - -CAN_EFF_MASK = {socket.CAN_EFF_MASK} -CAN_INV_FILTER = 0x20000000 # TODO: Add to CPython -CAN_SFF_MASK = {socket.CAN_SFF_MASK} - -CAN_RAW = {socket.CAN_RAW} -CAN_RAW_FD_FRAMES = {socket.CAN_RAW_FD_FRAMES} -CAN_RAW_FILTER = {socket.CAN_RAW_FILTER} -CAN_RAW_JOIN_FILTERS = {socket.CAN_RAW_JOIN_FILTERS} -SOL_CAN_RAW = {socket.SOL_CAN_RAW} -""" - - -def main() -> None: - print(TEMPLATE) - - -if __name__ == "__main__": - try: - main() - except KeyboardInterrupt: - pass