Merge pull request #370 from mj-will/update--to-black-2024

mj-will · web-flow · commit 89250352f28b · 2024-02-24T18:36:36.000Z
Update to black 2024
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: psf/black@stable
         with:
           options: "--check --diff"
-          version: "22.12"
+          version: "24.2"
   flake8:
     name: Lint - Flake8
     runs-on: ubuntu-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
     -   id: check-yaml
     -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3
diff --git a/nessai/samplers/base.py b/nessai/samplers/base.py
@@ -384,9 +384,9 @@ def get_result_dictionary(self):
         d["seed"] = self.seed
         d["sampling_time"] = self.sampling_time.total_seconds()
         d["total_likelihood_evaluations"] = self.model.likelihood_evaluations
-        d[
-            "likelihood_evaluation_time"
-        ] = self.likelihood_evaluation_time.total_seconds()
+        d["likelihood_evaluation_time"] = (
+            self.likelihood_evaluation_time.total_seconds()
+        )
         d["history"] = self.history
         if hasattr(self.model, "truth"):
             d["truth"] = self.model.truth
diff --git a/nessai/samplers/importancesampler.py b/nessai/samplers/importancesampler.py
@@ -1219,10 +1219,10 @@ def add_and_update_points(self, n: int):
             self.training_samples.samples, self.training_samples.log_q
         )
 
-        self.training_samples.samples[
-            "logQ"
-        ] = self.proposal.compute_meta_proposal_from_log_q(
-            self.training_samples.log_q
+        self.training_samples.samples["logQ"] = (
+            self.proposal.compute_meta_proposal_from_log_q(
+                self.training_samples.log_q
+            )
         )
         self.training_samples.samples["logW"] = -self.training_samples.samples[
             "logQ"
@@ -1239,10 +1239,10 @@ def add_and_update_points(self, n: int):
             self.iid_samples.log_q = self.proposal.update_log_q(
                 self.iid_samples.samples, self.iid_samples.log_q
             )
-            self.iid_samples.samples[
-                "logQ"
-            ] = self.proposal.compute_meta_proposal_from_log_q(
-                self.iid_samples.log_q
+            self.iid_samples.samples["logQ"] = (
+                self.proposal.compute_meta_proposal_from_log_q(
+                    self.iid_samples.log_q
+                )
             )
             self.iid_samples.samples["logW"] = -self.iid_samples.samples[
                 "logQ"
@@ -1316,10 +1316,10 @@ def adjust_final_samples(self, n_batches=5):
                             update_counts=False,
                         )
                     new_samples["it"] = it
-                    new_samples[
-                        "logL"
-                    ] = self.model.batch_evaluate_log_likelihood(
-                        new_samples, unit_hypercube=True
+                    new_samples["logL"] = (
+                        self.model.batch_evaluate_log_likelihood(
+                            new_samples, unit_hypercube=True
+                        )
                     )
                     new_loc = np.searchsorted(samples["it"], new_samples["it"])
                     samples = np.insert(samples, new_loc, new_samples)
@@ -2227,33 +2227,33 @@ def get_result_dictionary(self):
             self.training_samples.samples
         )
         d["training_log_evidence"] = self.training_samples.state.log_evidence
-        d[
-            "training_log_evidence_error"
-        ] = self.training_samples.state.log_evidence_error
-        d[
-            "training_log_posterior_weights"
-        ] = self.training_samples.state.log_posterior_weights
+        d["training_log_evidence_error"] = (
+            self.training_samples.state.log_evidence_error
+        )
+        d["training_log_posterior_weights"] = (
+            self.training_samples.state.log_posterior_weights
+        )
         # Will all be None if the final samples haven't been drawn
         d["bootstrap_log_evidence"] = self.bootstrap_log_evidence
         d["bootstrap_log_evidence_error"] = self.bootstrap_log_evidence_error
         if self.iid_samples:
             d["iid_log_evidence"] = self.iid_samples.state.log_evidence
-            d[
-                "iid_log_evidence_error"
-            ] = self.iid_samples.state.log_evidence_error
+            d["iid_log_evidence_error"] = (
+                self.iid_samples.state.log_evidence_error
+            )
         d["samples"] = self.final_samples
         d["log_posterior_weights"] = self.final_log_posterior_weights
         d["log_evidence"] = self.final_log_evidence
         d["log_evidence_error"] = self.final_log_evidence_error
 
         d["training_time"] = self.training_time.total_seconds()
         d["draw_samples_time"] = self.draw_samples_time.total_seconds()
-        d[
-            "add_and_update_samples_time"
-        ] = self.add_and_update_samples_time.total_seconds()
-        d[
-            "draw_final_samples_time"
-        ] = self.draw_final_samples_time.total_seconds()
+        d["add_and_update_samples_time"] = (
+            self.add_and_update_samples_time.total_seconds()
+        )
+        d["draw_final_samples_time"] = (
+            self.draw_final_samples_time.total_seconds()
+        )
         d["proposal_importance"] = self.importance
 
         return d
diff --git a/nessai/utils/settings.py b/nessai/utils/settings.py
@@ -1,7 +1,8 @@
-"""Utilities for determing the settings available in nessai.
+"""Utilities for determining the settings available in nessai.
 
 Used for bilby and pycbc-inference.
 """
+
 from inspect import signature
 from typing import List, Callable, Tuple
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,6 +57,7 @@ dev = [
     "pre-commit",
     "ray[default]",
     "corner",
+    "black>=24.0",
 ]
 docs = [
     "sphinx",
@@ -104,4 +105,3 @@ target-version = [
 extend-ignore = [
     "E203",
 ]
-
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 """General configuration for the test suite"""
+
 import sys
 
 from numpy.random import seed
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,4 +1,5 @@
 """Tests for the config module"""
+
 from nessai.config import LivepointsConfig
 import numpy as np
 
diff --git a/tests/test_evidence/test_ins_evidence.py b/tests/test_evidence/test_ins_evidence.py
@@ -1,4 +1,5 @@
 """Test the INS evidence"""
+
 from unittest.mock import MagicMock, create_autospec
 
 import numpy as np
diff --git a/tests/test_flowmodel/test_flowmodel_importance.py b/tests/test_flowmodel/test_flowmodel_importance.py
@@ -1,6 +1,7 @@
 """
 Test the ImportanceFlowModel.
 """
+
 import os
 import pickle
 from unittest.mock import MagicMock, create_autospec, patch
diff --git a/tests/test_gw/conftest.py b/tests/test_gw/conftest.py
@@ -1,4 +1,5 @@
 """Configuration for the GW tests"""
+
 from typing import Callable
 
 from nessai.livepoint import dict_to_live_points
diff --git a/tests/test_gw/test_reparameterisation_integration.py b/tests/test_gw/test_reparameterisation_integration.py
@@ -1,4 +1,5 @@
 """Integration test for the reparameterisation in GWFlowProposal"""
+
 from nessai.gw.proposal import GWFlowProposal
 import numpy as np
 import pytest
diff --git a/tests/test_livepoint.py b/tests/test_livepoint.py
@@ -1,4 +1,5 @@
 """Tests for livepoint functions"""
+
 import sys
 
 import numpy as np
diff --git a/tests/test_priors.py b/tests/test_priors.py
@@ -1,6 +1,7 @@
 """
 Test the prior functions.
 """
+
 import numpy as np
 import pytest
 
diff --git a/tests/test_proposal/test_importance/conftest.py b/tests/test_proposal/test_importance/conftest.py
@@ -1,4 +1,5 @@
 """Configuration for ImportanceFlowProposal tests"""
+
 import pytest
 from unittest.mock import MagicMock, create_autospec
 
diff --git a/tests/test_proposal/test_importance/test_config.py b/tests/test_proposal/test_importance/test_config.py
@@ -1,4 +1,5 @@
 """Test the general configuration for ImportanceFlowProposal"""
+
 import pytest
 from unittest.mock import MagicMock, patch
 
diff --git a/tests/test_proposal/test_importance/test_prob.py b/tests/test_proposal/test_importance/test_prob.py
@@ -1,4 +1,5 @@
 """Tests methods for computing log_prob etc"""
+
 from unittest.mock import MagicMock, create_autospec
 
 from nessai.livepoint import live_points_to_array
diff --git a/tests/test_proposal/test_importance/test_properties.py b/tests/test_proposal/test_importance/test_properties.py
@@ -1,4 +1,5 @@
 """Test the properties defined in ImportanceFlowProposal"""
+
 from unittest.mock import patch
 from nessai.proposal.importance import ImportanceFlowProposal as IFP
 import pytest
diff --git a/tests/test_proposal/test_importance/test_rescaling.py b/tests/test_proposal/test_importance/test_rescaling.py
@@ -1,4 +1,5 @@
 """Test the rescaling functions in ImportanceFlowProposal"""
+
 from unittest.mock import MagicMock, patch
 
 from nessai import config
diff --git a/tests/test_proposal/test_importance/test_resume.py b/tests/test_proposal/test_importance/test_resume.py
@@ -1,4 +1,5 @@
 """Test the properties defined in ImportanceFlowProposal"""
+
 import pickle
 from unittest.mock import MagicMock, patch
 
diff --git a/tests/test_proposal/test_importance/test_sampling.py b/tests/test_proposal/test_importance/test_sampling.py
@@ -1,4 +1,5 @@
 """Tests related to sampling from ImportanceFlowProposal"""
+
 from unittest.mock import MagicMock, create_autospec
 
 from nessai.flowmodel.importance import ImportanceFlowModel
diff --git a/tests/test_proposal/test_importance/test_training.py b/tests/test_proposal/test_importance/test_training.py
@@ -1,4 +1,5 @@
 """Test training functions in ImportanceFlowProposal"""
+
 import os
 
 from nessai.proposal.importance import ImportanceFlowProposal as IFP
diff --git a/tests/test_reparameterisations/conftest.py b/tests/test_reparameterisations/conftest.py
@@ -1,4 +1,5 @@
 """Configuration for the reparameterisation tests"""
+
 from dataclasses import dataclass
 from typing import List
 
diff --git a/tests/test_samplers/test_importance_nested_sampler/test_config.py b/tests/test_samplers/test_importance_nested_sampler/test_config.py
@@ -1,4 +1,5 @@
 """Test configuration of INS"""
+
 from unittest.mock import MagicMock
 
 from nessai import config as nessai_config
diff --git a/tests/test_samplers/test_importance_nested_sampler/test_proposal.py b/tests/test_samplers/test_importance_nested_sampler/test_proposal.py
@@ -1,4 +1,5 @@
 """Tests for the proposals and meta-proposal"""
+
 import datetime
 from unittest.mock import MagicMock
 
diff --git a/tests/test_samplers/test_importance_nested_sampler/test_result.py b/tests/test_samplers/test_importance_nested_sampler/test_result.py
@@ -1,4 +1,5 @@
 """Tests related to the results returned by the sampler"""
+
 import datetime
 from unittest.mock import MagicMock, create_autospec
 
diff --git a/tests/test_samplers/test_importance_nested_sampler/test_samples.py b/tests/test_samplers/test_importance_nested_sampler/test_samples.py
@@ -1,4 +1,5 @@
 """Tests related to how samples are handled"""
+
 from unittest.mock import MagicMock, create_autospec
 
 from nessai.livepoint import numpy_array_to_live_points
diff --git a/tests/test_samplers/test_importance_nested_sampler/test_threshold.py b/tests/test_samplers/test_importance_nested_sampler/test_threshold.py
@@ -1,4 +1,5 @@
 """Tests for level-related methods"""
+
 import os
 from unittest.mock import MagicMock
 
diff --git a/tests/test_sampling/test_ins_sampling.py b/tests/test_sampling/test_ins_sampling.py
@@ -1,4 +1,5 @@
 """Test sampling with the importance nested sampler"""
+
 import os
 import pickle
 
diff --git a/tests/test_utils/test_sorting_utils.py b/tests/test_utils/test_sorting_utils.py
@@ -1,4 +1,5 @@
 """Tests for the sorting utilities"""
+
 from dataclasses import dataclass
 from typing import List
 
diff --git a/tests/test_utils/test_testing_utils.py b/tests/test_utils/test_testing_utils.py
@@ -1,6 +1,7 @@
 """
 Test the testing utilities
 """
+
 import numpy as np
 import pytest
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ dev = [`
`57`	`57`	`"pre-commit",`
`58`	`58`	`"ray[default]",`
`59`	`59`	`"corner",`
	`60`	`+ "black>=24.0",`
`60`	`61`	`]`
`61`	`62`	`docs = [`
`62`	`63`	`"sphinx",`
`@@ -104,4 +105,3 @@ target-version = [`
`104`	`105`	`extend-ignore = [`
`105`	`106`	`"E203",`
`106`	`107`	`]`
`107`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""General configuration for the test suite"""`
	`2`	`+`
`2`	`3`	`import sys`
`3`	`4`
`4`	`5`	`from numpy.random import seed`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Tests for the config module"""`
	`2`	`+`
`2`	`3`	`from nessai.config import LivepointsConfig`
`3`	`4`	`import numpy as np`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Test the INS evidence"""`
	`2`	`+`
`2`	`3`	`from unittest.mock import MagicMock, create_autospec`
`3`	`4`
`4`	`5`	`import numpy as np`