Further fix pre-commit checks and checked files.

facebookresearch · Jun 20, 2021 · 1cd9ab9 · 1cd9ab9
1 parent 2bd281c
commit 1cd9ab9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,3 +16,11 @@ repos:
     rev: 'v0.6.13'
     hooks:
     - id: cmake-format
+-   repo: local
+    hooks:
+    -   id: clang-format
+        name: clang-format
+        description: Format files with clang-format
+        entry: nle/scripts/run-clang-format
+        language: system
+        files: ^(src\/nle|include\/nle|win\/rl)\.(c|cc|cxx|cpp|cu|h|hpp|hxx|cuh|proto)$
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,9 +88,10 @@ file(
 add_library(nethack SHARED ${NETHACK_SRC})
 add_dependencies(nethack util dat)
 set_target_properties(nethack PROPERTIES CXX_STANDARD 14 SUFFIX ".so")
-target_include_directories(nethack PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-                                          ${NLE_INC_GEN} /usr/local/include
-                                          ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libtmt)
+target_include_directories(
+  nethack
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${NLE_INC_GEN} /usr/local/include
+         ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libtmt)
 target_link_directories(nethack PUBLIC /usr/local/lib)
 
 # Careful with -DMONITOR_HEAP: Ironically, it fails to fclose FILE* heaplog.

diff --git a/nle/scripts/run-clang-format b/nle/scripts/run-clang-format
@@ -205,7 +205,7 @@ def print_diff(diff_lines, use_color):
     if use_color:
         diff_lines = colorize(diff_lines)
     if sys.version_info[0] < 3:
-        sys.stdout.writelines((l.encode("utf-8") for l in diff_lines))
+        sys.stdout.writelines((line.encode("utf-8") for line in diff_lines))
     else:
         sys.stdout.writelines(diff_lines)