Merge branch 'master' of github.com:computationalgeography/lue

.clang-tidy

@@ -41,6 +41,7 @@ Checks: >-
     -clang-analyzer-cplusplus.Move,
     -clang-analyzer-cplusplus.NewDeleteLeaks,
     -clang-analyzer-deadcode.DeadStores,
+    -clang-diagnostic-error,
     -clang-diagnostic-unused-lambda-capture,
     -cppcoreguidelines-avoid-c-arrays,
     -modernize-avoid-c-arrays,

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ exclude: |
   )$
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -22,7 +22,7 @@ repos:
   hooks:
   - id: black
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.4.1
+  rev: v1.7.0
   hooks:
   - id: mypy
     # args: [--verbose]
@@ -50,26 +50,27 @@ repos:
   hooks:
   - id: clang-format
     args: [--style=file, -i]
-  # - id: clang-tidy
-  #   # Skipping lue/framework for now because of issues with using clang icw build setup for gcc
-  #   # Also skipping a few other files (unused ones, ...)
-  #   exclude: |
-  #     (?x)^(
-  #       source/command/.*|
-  #       source/data_model/test/include/lue/test/print.hpp|
-  #       source/data_model/translate/include/lue/translate/command.hpp|
-  #       source/data_model/translate/include/lue/translate/format.hpp|
-  #       source/data_model/translate/include/lue/translate/format/gdal_stack.hpp|
-  #       source/data_model/translate/include/lue/translate/format/gdal_stacks.hpp|
-  #       source/data_model/translate/src/format/gdal_stack.cpp|
-  #       source/data_model/translate/src/format/gdal_stacks.cpp|
-  #       source/data_model/translate/src/format/geo_eas.cpp|
-  #       source/data_model/utility/include/lue/utility/utility.hpp|
-  #       source/framework/.*|
-  #       source/framework/algorithm/benchmark/.*|
-  #       source/framework/benchmark/.*|
-  #       source/framework/case_study/.*|
-  #       source/imgui/main.cpp|
-  #       source/view/vulkan/.*|
-  #       source/view/view/src/vulkan_application.cpp|
-  #     )$
+  - id: clang-tidy
+    args: [--quiet]
+    # Skipping lue/framework for now because of issues with using clang icw build setup for gcc
+    # Also skipping a few other files (unused ones, ...)
+    exclude: |
+      (?x)^(
+        source/data_model/cxx/include/lue/core/configuration.hpp|
+        source/data_model/test/include/lue/test/print.hpp|
+        source/data_model/translate/include/lue/translate/command.hpp|
+        source/data_model/translate/include/lue/translate/format.hpp|
+        source/data_model/translate/include/lue/translate/format/gdal_stack.hpp|
+        source/data_model/translate/include/lue/translate/format/gdal_stacks.hpp|
+        source/data_model/translate/src/format/gdal_stack.cpp|
+        source/data_model/translate/src/format/gdal_stacks.cpp|
+        source/data_model/translate/src/format/geo_eas.cpp|
+        source/data_model/utility/include/lue/utility/utility.hpp|
+        source/framework/.*|
+        source/framework/algorithm/benchmark/.*|
+        source/framework/benchmark/.*|
+        source/framework/case_study/.*|
+        source/view/imgui/.*|
+        source/view/vulkan/.*|
+        source/view/view/src/vulkan_application.cpp|
+      )$

document/luepy/ext/generated_image.py

@@ -32,7 +32,6 @@ def depart_generated_image_node(self, node):
 
 
 class GeneratedImageDirective(Directive):
-
     required_arguments = 1
     has_content = False
 

environment/script/edit_dot_graph.py

@@ -44,7 +44,6 @@ def wrapper(*args, **kwargs):
 
 @checked_call
 def add_attribute(graph_name, output_name, node_name, attribute_name, attribute_value):
-
     graph = open(graph_name, "r").read()
     snippet = "{attribute}={value}".format(
         attribute=attribute_name, value=attribute_value

environment/script/lue_describe.py

@@ -21,20 +21,17 @@
 
 
 def print_message(indent, message):
-
     tabsize = 2
 
     print("{}{}".format(indent * tabsize * " ", message))
 
 
 def print_messages(indent, messages):
-
     for message in messages:
         print_message(indent, message)
 
 
 def print_heading(indent, length):
-
     print_messages(
         indent,
         [
@@ -71,7 +68,6 @@ def print_heading(indent, length):
 
 
 def describe_file(file, indent):
-
     print_message(indent, "file")
     print_messages(
         indent + 1,
@@ -106,7 +102,6 @@ def describe_file(file, indent):
 
 
 def describe_property_set(property_set, indent):
-
     print_message(indent, "property_set: {}".format(property_set.id.name))
     indent += 1
 
@@ -120,7 +115,6 @@ def describe_property_set(property_set, indent):
 
 
 def describe_property_sets(property_sets, indent):
-
     print_message(indent, "property_sets")
     indent += 1
 
@@ -129,7 +123,6 @@ def describe_property_sets(property_sets, indent):
 
 
 def describe_phenomenon(phenomenon, indent):
-
     print_message(indent, "phenomenon: {}".format(phenomenon.id.name))
     indent += 1
 
@@ -139,7 +132,6 @@ def describe_phenomenon(phenomenon, indent):
 
 
 def describe_phenomena(phenomena, indent):
-
     print_message(indent, "phenomena")
     indent += 1
 
@@ -148,12 +140,10 @@ def describe_phenomena(phenomena, indent):
 
 
 def describe_universe(universe, indent):
-
     assert False  # TODO
 
 
 def describe_universes(universes, indent):
-
     print_message(indent, "unverses")
     indent += 1
 
@@ -162,7 +152,6 @@ def describe_universes(universes, indent):
 
 
 def describe_dataset(dataset, indent):
-
     print_message(
         indent,
         "dataset: {}".format(os.path.splitext(os.path.basename(dataset.pathname))[0]),
@@ -176,7 +165,6 @@ def describe_dataset(dataset, indent):
 
 
 def describe_datasets(pathnames, indent=0):
-
     print_message(indent, "datasets")
     indent += 1
 

environment/script/raster_to_lue_json.py

@@ -32,7 +32,6 @@
 
 
 def raster_to_lue_json(raster_pathnames, lue_file, extent, discretization):
-
     object_id = 5
     properties = [
         {

environment/script/templatize.py

@@ -9,7 +9,6 @@
 
 
 def main():
-
     usage = """\
 Read a file, replace some placeholders with values, and write the result
 to a file

environment/script/write_conan_profile.py

@@ -332,7 +332,6 @@ def write_conan_profile(compiler_filename, profile_pathname):
         # we just add the newer version to the list of supported versions. Otherwise Conan wil
         # not install packages.
         if compiler_version not in compiler_versions:
-
             String = type(compiler_versions[0])
 
             compiler_versions.append(String(compiler_version))

source/CMakeLists.txt

@@ -1,7 +1,5 @@
 add_subdirectory(shared)
 
-# add_subdirectory(command)
-
 if(LUE_BUILD_DATA_MODEL)
     add_subdirectory(data_model)
 endif()