Various minor upgrades

.clang-format

@@ -5,7 +5,6 @@ Language: Cpp
 DerivePointerAlignment: false
 PointerAlignment: Left
 AccessModifierOffset: -4
-AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false
 AlignEscapedNewlines: DontAlign
 AllowShortBlocksOnASingleLine: false
@@ -27,7 +26,7 @@ BinPackArguments: false
 BinPackParameters: false
 ExperimentalAutoDetectBinPacking: false
 AllowAllParametersOfDeclarationOnNextLine: false
-
+AlignAfterOpenBracket: BlockIndent
 # AlwaysBreakAfterDefinitionReturnType: All
 
 BraceWrapping:

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     steps:
 
     - name: Basic GitHub action setup
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set conda environment
       uses: mamba-org/provision-with-micromamba@main

.github/workflows/gh-pages.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
 
     - name: Basic GitHub action setup
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

.github/workflows/pre-commit.yml

@@ -9,6 +9,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v2
     - uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 22.3.0
+  rev: 23.3.0
   hooks:
   - id: black
     args: [--safe, --quiet, --line-length=100]
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
   - id: check-yaml
   - id: debug-statements
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.3.0
+  rev: v2.8.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']
@@ -22,25 +22,34 @@ repos:
   - id: autoflake
     args: [--in-place, --remove-unused-variable, --remove-all-unused-imports]
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v3.1.0
+  rev: v3.9.0
   hooks:
   - id: reorder-python-imports
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.34.0
+  rev: v3.3.1
   hooks:
   - id: pyupgrade
     args: [--py36-plus]
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 6.0.0
   hooks:
   - id: flake8
     args: [--max-line-length=100]
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.20.1
+  rev: v2.2.0
   hooks:
   - id: setup-cfg-fmt
-- repo: https://github.com/pocc/pre-commit-hooks
-  rev: v1.3.5
+- repo: https://github.com/tdegeus/cpp_comment_format
+  rev: v0.2.0
+  hooks:
+  - id: cpp_comment_format
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v16.0.0
   hooks:
   - id: clang-format
     args: [-i]
+- repo: https://github.com/tdegeus/conda_envfile
+  rev: v0.4.2
+  hooks:
+  - id: conda_envfile_parse
+    files: environment.yaml

CMakeLists.txt

@@ -11,7 +11,7 @@ option(BUILD_ALL "${PROJECT_NAME}: Build tests, Python API & docs" OFF)
 option(BUILD_TESTS "${PROJECT_NAME}: Build tests" OFF)
 option(BUILD_EXAMPLES "${PROJECT_NAME}: Build examples" OFF)
 option(BUILD_PYTHON "${PROJECT_NAME}: Build Python API" OFF)
-option(BUILD_DOCS "${PROJECT_NAME}: Build docs" OFF)
+option(BUILD_DOCS "${PROJECT_NAME}: Build docs (use `make html`)" OFF)
 
 if(SKBUILD)
     set(BUILD_ALL 0)
@@ -186,13 +186,9 @@ if(BUILD_DOCS OR BUILD_ALL)
     set(DOXYGEN_QUIET YES)
     set(DOXYGEN_WARN_IF_UNDOCUMENTED YES)
     set(DOXYGEN_WARN_AS_ERROR YES)
+    set(DOXYGEN_HTML_COLORSTYLE TOGGLE)
     set(DOXYGEN_ALIASES "license=@par License:")
     set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "README.md")
-
-    set(DOXYGEN_HTML_EXTRA_STYLESHEET
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/doxystyle/doxygen-awesome.css"
-        "${CMAKE_CURRENT_SOURCE_DIR}/docs/doxystyle/custom.css")
-
     set(DOXYGEN_STRIP_FROM_INC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include")
     set(DOXYGEN_STRIP_FROM_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include")
     doxygen_add_docs(html "${CMAKE_CURRENT_SOURCE_DIR}/include" "README.md")

cppcolormap.pc.in

@@ -3,5 +3,5 @@ includedir=${prefix}/include
 
 Name: @PROJECT_NAME@
 Description: Colormaps for C++.
-Version: @CPPCOLORMAP_VERSION@
+Version: @PROJECT_VERSION@
 Cflags: -I${includedir}