doxysphinx 3.2.1__tar.gz → 3.2.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/PKG-INFO +1 -1
  2. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/doxygen.py +12 -11
  3. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/pyproject.toml +2 -2
  4. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/LICENSE +0 -0
  5. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/LICENSE.md +0 -0
  6. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/README.md +0 -0
  7. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/__init__.py +0 -0
  8. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/__main__.py +0 -0
  9. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/cli.py +0 -0
  10. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/html_parser.py +0 -0
  11. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/process.py +0 -0
  12. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/resources/custom.scss +0 -0
  13. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/resources/toc_template.html.j2 +0 -0
  14. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/resources.py +0 -0
  15. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/sphinx.py +0 -0
  16. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/toc.py +0 -0
  17. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/__init__.py +0 -0
  18. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/contexts.py +0 -0
  19. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/exceptions.py +0 -0
  20. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/files.py +0 -0
  21. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/iterators.py +0 -0
  22. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/utils/pathlib_fix.py +0 -0
  23. {doxysphinx-3.2.1 → doxysphinx-3.2.2}/doxysphinx/writer.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: doxysphinx
3
- Version: 3.2.1
3
+ Version: 3.2.2
4
4
  Summary: Integrates doxygen html documentation with sphinx.
5
5
  Home-page: https://github.com/boschglobal/doxysphinx
6
6
  License: MIT
@@ -6,11 +6,13 @@
6
6
  # Author(s):
7
7
  # - Markus Braun, :em engineering methods AG (contracted by Robert Bosch GmbH)
8
8
  # - Celina Adelhardt, :em engineering methods AG (contracted by Robert Bosch GmbH)
9
+ # - Gergely Meszaros, Stream HPC B.V. (contracted by Advanced Micro Devices Inc.)
9
10
  # =====================================================================================
10
11
  """The doxygen module contains classes and functions specific to doxygen."""
11
12
 
12
13
  import os
13
14
  import re
15
+ import shutil
14
16
  from dataclasses import dataclass
15
17
  from pathlib import Path
16
18
  from typing import Any, Dict, List, Union
@@ -50,18 +52,17 @@ def read_doxyconfig(doxyfile: Path, doxygen_exe: str, doxygen_cwd: Path) -> Conf
50
52
  def _compare_configs(doxyfile: Path, doxygen_exe: str, doxygen_cwd: Path) -> DoxyOutput:
51
53
  from subprocess import CalledProcessError, run # nosec: B404
52
54
 
55
+ doxygen = shutil.which(doxygen_exe)
56
+ if doxygen is None:
57
+ return DoxyOutput("", f"Command not found: {doxygen_exe}")
58
+
53
59
  try:
54
- default_config = run( # nosec: B607, B603
55
- f"{doxygen_exe} -s -g -", cwd=doxygen_cwd, shell=True, capture_output=True # nosec: B607, B603, B602
56
- ) # nosec: B607, B603
57
- if default_config.check_returncode:
58
- custom_config = run( # nosec: B607, B603
59
- f"{doxygen_exe} -x {doxyfile}",
60
- cwd=doxygen_cwd,
61
- shell=True, # nosec: B602
62
- capture_output=True, # nosec: B607, B603
63
- ) # nosec: B607, B603
64
- custom_config.check_returncode
60
+ default_config = run( # nosec: B603
61
+ [doxygen_exe, "-s", "-g", "-"], cwd=doxygen_cwd, capture_output=True, check=True
62
+ )
63
+ custom_config = run( # nosec: B603
64
+ [doxygen_exe, "-x", doxyfile.absolute()], cwd=doxygen_cwd, capture_output=True, check=False
65
+ )
65
66
 
66
67
  return DoxyOutput(
67
68
  default_config.stdout.decode("utf-8") + custom_config.stdout.decode("utf-8"),
@@ -9,7 +9,7 @@
9
9
 
10
10
  [tool.poetry]
11
11
  name = "doxysphinx"
12
- version = "3.2.1"
12
+ version = "3.2.2"
13
13
  description = "Integrates doxygen html documentation with sphinx."
14
14
  authors = [
15
15
  "Nirmal Sasidharan <nirmal.sasidharan@de.bosch.com>",
@@ -88,7 +88,7 @@ doxysphinx = "doxysphinx.cli:cli"
88
88
 
89
89
  [tool.commitizen]
90
90
  name = "cz_conventional_commits"
91
- version = "3.2.1"
91
+ version = "3.2.2"
92
92
  tag_format = "v$version"
93
93
  version_files = ["pyproject.toml:^version"]
94
94
  bump_message = """chore(release): release $current_version → $new_version by commitizen [skip-ci]
File without changes
File without changes
File without changes
File without changes
File without changes