tickets/PREOPS-4848: update for pytest 8 and black 24

.github/workflows/test_and_build.yaml

@@ -74,6 +74,10 @@ jobs:
         shell: bash -l {0}
         run: conda list
 
+      - name: black format test
+        shell: bash -l {0}
+        run: black --check .
+
       - name: Run unit tests
         shell: bash -l {0}
         run: |

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
       - id: check-toml
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 24.1.1
     hooks:
       - id: black
         # It is recommended to specify the latest version of Python

pyproject.toml

@@ -45,7 +45,6 @@ test = [
     "isort",
     "ruff",
     "pytest-cov",
-    "pytest-black",
     "geckodriver"
 ]
 dev = [
@@ -71,7 +70,7 @@ __version__ = "{version}"
 """
 
 [tool.pytest.ini_options]
-addopts = "--black --ignore-glob=*/version.py --ignore-glob=*data_dir/*"
+addopts = "--ignore-glob=*/version.py --ignore-glob=*data_dir/*"
 testpaths = "."
 
 [tool.black]

schedview/plot/scheduler.py

@@ -888,9 +888,9 @@
         if "displayed_value_metadata" in self.bokeh_models:
             tier = f"tier {self.survey_index[0]}"
             survey = self._unique_survey_name()
-            self.bokeh_models[
-                "displayed_value_metadata"
-            ].text = f"<p>Displayed value: {self.map_key} from {tier}, {survey}</p>"
+            self.bokeh_models["displayed_value_metadata"].text = (
+                f"<p>Displayed value: {self.map_key} from {tier}, {survey}</p>"
+            )
 
     def make_time_display(self):
         """Create the bokeh model showing what time is being represented."""

test-requirements.txt

@@ -1,7 +1,6 @@
-pytest<8.0.0
-black>=23.0.0,<24.0.0
+pytest
+black
 ruff
 pytest-cov
-pytest-black
 firefox
 geckodriver