Merge pull request #293 from giffels/release-0.7.1

Release version to 0.7.1
MatterMiners · May 17, 2023 · e4ef2ca · e4ef2ca
2 parents 96e48d2 + 325f1d2
commit e4ef2ca
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 41 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -13,6 +13,7 @@ R. Florian von Cube <[email protected]>
 mschnepf <[email protected]>
 Alexander Haas <[email protected]>
 mschnepf <[email protected]>
+Dirk Sammel <[email protected]>
 Matthias J. Schnepf <[email protected]>
 Matthias Schnepf <[email protected]>
 LGTM Migrator <[email protected]>

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,13 +1,18 @@
-.. Created by changelog.py at 2023-04-03, command
+.. Created by changelog.py at 2023-05-16, command
    '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'
 
 #########
 CHANGELOG
 #########
 
-[Unreleased] - 2023-04-03
-=========================
+[0.7.1] - 2023-05-16
+====================
+
+Changed
+-------
+
+* Change pyauditor version to 0.1.0
 
 Fixed
 -----

diff --git a/docs/source/changes/290.fix_optional_auditor_config.yaml b/docs/source/changes/290.fix_optional_auditor_config.yaml
@@ -0,0 +1,7 @@
+category: Fixed
+summary: "Fixed optional configuration items in Auditor to be actual optional"
+description: "The AUDITOR plugin crashes when no components are defined in the config,\
+  \ despite being marked as \"optional\" in the \ndocumentation.\n"
+pull requests:
+- 290
+version: 0.7.1
diff --git a/docs/source/changes/292.fixed_moab_site_adapater.yaml b/docs/source/changes/292.fixed_moab_site_adapater.yaml
@@ -10,3 +10,4 @@ issues:
 - 291
 pull requests:
 - 292
+version: 0.7.1
diff --git a/docs/source/changes/294_changed_pyauditor_version.yaml b/docs/source/changes/294_changed_pyauditor_version.yaml
@@ -0,0 +1,7 @@
+category: changed
+summary: "Change pyauditor version to 0.1.0"
+description: |
+  Change `pyauditor` to version 0.1.0
+pull requests:
+- 294
+version: 0.7.1
diff --git a/docs/source/changes/versions.yaml b/docs/source/changes/versions.yaml
@@ -1,3 +1,5 @@
+- semver: 0.7.1
+  date: '2023-05-16'
 - semver: 0.7.0
   date: '2023-02-24'
 - semver: 0.6.0

diff --git a/tardis/__about__.py b/tardis/__about__.py
@@ -3,7 +3,7 @@
 __summary__ = "Transparent Adaptive Resource Dynamic Integration System"
 __url__ = "https://github.com/matterminers/tardis"
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 __author__ = "Manuel Giffels, Matthias Schnepf"
 __email__ = "[email protected]"
 __copyright__ = "2018 - 2023 %s and Contributors" % __author__

diff --git a/tests/adapters_t/batchsystems_t/test_htcondor.py b/tests/adapters_t/batchsystems_t/test_htcondor.py
@@ -259,21 +259,20 @@ def test_get_machine_status(self):
         self.mock_executor.return_value.run_command.side_effect = (
             CommandExecutionFailure(message="Test", exit_code=123, stderr="Test")
         )
+
+        attributes = {
+            "Machine": "Machine",
+            "Name": "Name",
+            "State": "State",
+            "Activity": "Activity",
+            "TardisDroneUuid": "TardisDroneUuid",
+        }
+        # Escape htcondor expressions and add them to attributes
+        attributes.update(
+            {key: quote(value) for key, value in self.config.BatchSystem.ratios.items()}
+        )
         with self.assertLogs(level=logging.WARNING):
             with self.assertRaises(CommandExecutionFailure):
-                attributes = {
-                    "Machine": "Machine",
-                    "State": "State",
-                    "Activity": "Activity",
-                    "TardisDroneUuid": "TardisDroneUuid",
-                }
-                # Escape htcondor expressions and add them to attributes
-                attributes.update(
-                    {
-                        key: quote(value)
-                        for key, value in self.config.BatchSystem.ratios.items()
-                    }
-                )
                 run_async(
                     partial(
                         htcondor_status_updater,
@@ -282,9 +281,7 @@ def test_get_machine_status(self):
                         self.mock_executor.return_value,
                     )
                 )
-                self.mock_executor.return_value.run_command.assert_called_with(
-                    self.command
-                )
+        self.mock_executor.return_value.run_command.assert_called_with(self.command)
         self.mock_executor.return_value.run_command.side_effect = None
 
     @mock_executor_run_command(stdout=CONDOR_RETURN)

diff --git a/tests/adapters_t/batchsystems_t/test_slurm.py b/tests/adapters_t/batchsystems_t/test_slurm.py
@@ -181,14 +181,16 @@ def test_get_machine_status(self):
             CommandExecutionFailure(message="Test", exit_code=123, stderr="Test")
         )
 
+        attributes = {
+            "statelong": "statelong",
+            "cpusstate": "cpusstate",
+            "allocmem": "allocmem",
+            "memory": "memory",
+            "features": "features",
+            "nodehost": "nodehost",
+        }
         with self.assertLogs(level="WARN"):
             with self.assertRaises(CommandExecutionFailure):
-                attributes = {
-                    "Machine": "Machine",
-                    "State": "State",
-                    "Activity": "Activity",
-                    "TardisDroneUuid": "TardisDroneUuid",
-                }
                 run_async(
                     partial(
                         slurm_status_updater,
@@ -197,9 +199,7 @@ def test_get_machine_status(self):
                         self.mock_executor.return_value,
                     )
                 )
-                self.mock_executor.return_value.run_command.assert_called_with(
-                    self.command
-                )
+        self.mock_executor.return_value.run_command.assert_called_with(self.command)
 
         self.mock_executor.return_value.run_command.side_effect = None
 

diff --git a/tests/rest_t/app_t/test_security.py b/tests/rest_t/app_t/test_security.py
@@ -55,18 +55,15 @@ def test_check_scope_permissions(self):
             check_scope_permissions(
                 ["user:get", "resources:get"], ["user:get", "user:put"]
             )
-            self.assertEqual(
-                cm.exception,
-                HTTPException(
-                    status_code=status.HTTP_403_FORBIDDEN,
-                    detail={
-                        "msg": "Not enough permissions",
-                        "failedAt": "resources:get",
-                        "allowedScopes": ["user:get", "user:put"],
-                    },
-                ),
-            )
-
+        self.assertEqual(cm.exception.status_code, status.HTTP_403_FORBIDDEN)
+        self.assertDictEqual(
+            cm.exception.detail,
+            {
+                "msg": "Not enough permissions",
+                "failedAt": "resources:get",
+                "allowedScopes": ["user:get", "user:put"],
+            },
+        )
         check_scope_permissions(["resources:get"], ["resources:get"])
 
     def test_check_authentication(self):
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ issues: @@
     - 291
     pull requests:
     - 292
+    version: 0.7.1