Merge branch 'issue/version-bump' into next

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.1
+current_version = 1.7.0
 tag = False
 commit = False
 

.github/pull_request_template.md

@@ -13,8 +13,3 @@ Strike through any lines that are not applicable (`~~line~~`) then check the box
 - [ ] Code is clear and sufficiently documented
 - [ ] Correct, in line with design
 - [ ] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
-
-# Reviewer Checklist:
-
-- [ ] Code is clear and sufficiently documented
-- [ ] Correct, in line with design

CHANGELOG.md

@@ -1,6 +1,7 @@
-# v 1.6.1 (2022-11-07)
+# v 1.7.0 (2022-12-20)
 Changes in this release:
 - Ensure that environment settings defined by Inmanta extensions are present in the generated documentation.
+- Try to load all modules provided in config options list. Do not fail is one is missing.
 
 # v 1.6.0 (2022-09-09)
 Changes in this release:

ci/Jenkinsfile-test

@@ -30,7 +30,7 @@ pipeline {
         axes {
           axis {
             name "CORE_BRANCH"
-            values "master", "iso5", "iso4"
+            values "master", "iso6", "iso5", "iso4"
           }
           axis {
             name "MODULES_V2"
@@ -113,4 +113,9 @@ pipeline {
       }
     }
   }
+  post{
+    cleanup{
+      deleteDir()
+    }
+  }
 }

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='inmanta-sphinx',
-    version='1.6.1',
+    version='1.7.0',
     url='https://github.com/inmanta/inmanta-sphinx',
     license='ASL 2.0',
     author='Inmanta',

sphinxcontrib/inmanta/config.py

@@ -253,7 +253,12 @@ def _get_namespaces(self):
     def run(self):
         namespaces = self._get_namespaces()
         for namespace in namespaces:
-            importlib.import_module(namespace)
+            try:
+                importlib.import_module(namespace)
+            except ModuleNotFoundError:
+                # The documentation lists all possible Python modules in the server codebase with config. Only the ones that exist will be
+                # rendered. This allows a single file for both OSS and ISO releases.
+                LOGGER.warning("Unable to load module %s, no config will be loaded for this module", namespace)
 
         result = ViewList()
         source_name = '<' + __name__ + '>'