Merge pull request #150 from neutrons/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

.github/workflows/ci.yml

@@ -33,7 +33,9 @@ jobs:
         export DJANGO_SETTINGS_MODULE='reporting.reporting_app.settings.unittest'
         python -m pytest --cov --cov-report=xml --cov-report=term src
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Build documentation
       run: |
         conda activate webmon

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: check-docstring-first
@@ -16,11 +16,11 @@ repos:
       - id: end-of-file-fixer
       - id: sort-simple-yaml
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.4.0
     hooks:
       - id: black
         args: ['--line-length=119']
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
     - id: flake8

src/dasmon_app/dasmon_listener/amq_consumer.py

@@ -189,10 +189,10 @@ def on_message(self, frame):
             # elif 'timestamp' in data_dict:
             #    timestamp = data_dict['timestamp']
             for key in data_dict:
-                if key == "monitors" and type(data_dict[key]) == dict:
+                if key == "monitors" and isinstance(data_dict[key], dict):
                     for item in data_dict[key]:
                         # Protect against old API
-                        if not type(data_dict[key][item]) == dict:
+                        if not isinstance(data_dict[key][item], dict):
                             key_id = self.retrieve_parameter("monitor_count_%s" % str(item))
                             store_and_cache(
                                 instrument,

src/dasmon_app/dasmon_listener/listener_daemon.py

@@ -1,6 +1,7 @@
 """
     DASMON listener daemon
 """
+
 import sys
 import argparse
 

src/webmon_app/reporting/dasmon/legacy_status.py

@@ -4,6 +4,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2015 Oak Ridge National Laboratory
 """
+
 import httplib2
 import json
 import logging

src/webmon_app/reporting/dasmon/models.py

@@ -3,6 +3,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2015 Oak Ridge National Laboratory
 """
+
 from django.db import models
 from reporting.report.models import Instrument
 

src/webmon_app/reporting/dasmon/view_util.py

@@ -4,6 +4,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2014 Oak Ridge National Laboratory
 """
+
 from reporting.report.models import Instrument, DataRun, WorkflowSummary
 from reporting.dasmon.models import (
     Parameter,
@@ -1082,7 +1083,7 @@ def get_signals(instrument_id):
                 if len(latests) == 0:
                     latests = PVStringCache.objects.filter(instrument=instrument_id, name=item.pv_name)
                 latest = latests.latest("update_time")
-                if type(latest.value) == float:
+                if isinstance(latest.value, float):
                     value = "%g" % latest.value
                 else:
                     value = "%s" % latest.value

src/webmon_app/reporting/pvmon/models.py

@@ -4,6 +4,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2014 Oak Ridge National Laboratory
 """
+
 from django.db import models
 from reporting.report.models import Instrument
 

src/webmon_app/reporting/pvmon/views.py

@@ -1,6 +1,7 @@
 """
     Live PV monitoring
 """
+
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.urls import reverse

src/webmon_app/reporting/reduction/view_util.py

@@ -4,6 +4,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2014 Oak Ridge National Laboratory
 """
+
 from django.conf import settings
 from django.urls import reverse
 import logging
@@ -79,7 +80,7 @@ def send_template_request(instrument_id, template_dict, user="unknown"):
     """
     use_default = False
     if "use_default" in template_dict:
-        if type(template_dict["use_default"]) == bool:
+        if isinstance(template_dict["use_default"], bool):
             use_default = template_dict["use_default"]
         else:
             use_default = template_dict["use_default"].lower() == "true"

src/webmon_app/reporting/report/models.py

@@ -3,4 +3,5 @@
     reporting app. The models are defined in the workflow manager and should be
     installed on the system before running the app.
 """
+
 from workflow.database.report.models import *  # noqa: F401, F403

src/webmon_app/reporting/report/view_util.py

@@ -4,6 +4,7 @@
     @author: M. Doucet, Oak Ridge National Laboratory
     @copyright: 2014 Oak Ridge National Laboratory
 """
+
 import logging
 import json
 import datetime

src/webmon_app/reporting/reporting_app/settings/develop.py

@@ -1,4 +1,5 @@
 """This is the settings to be used for a local developer build inside of docker"""
+
 from .base import *  # noqa
 import ldap
 

src/webmon_app/reporting/reporting_app/settings/envtest.py

@@ -1,4 +1,5 @@
 """This is the settings to be used for a remote test deploy"""
+
 from .base import *  # noqa
 
 # symbols to make flake8 happy

src/webmon_app/reporting/reporting_app/settings/prod.py

@@ -1,4 +1,5 @@
 """This is the settings to be used for a remote production deploy"""
+
 from .base import *  # noqa
 from os import environ
 

src/webmon_app/reporting/reporting_app/settings/unittest.py

@@ -1,4 +1,5 @@
 """This configuration is meant for running the unittests outside of docker"""
+
 from .base import *  # noqa
 from .base import INSTALLED_APPS
 

src/webmon_app/reporting/reporting_app/view_util.py

@@ -3,6 +3,7 @@
 
     @copyright: 2014 Oak Ridge National Laboratory
 """
+
 from django.conf import settings
 import logging
 

src/webmon_app/reporting/reporting_app/wsgi.py

@@ -13,6 +13,7 @@
 framework.
 
 """
+
 import os
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "reporting.reporting_app.settings.develop")

src/webmon_app/reporting/users/views.py

@@ -1,6 +1,7 @@
 """
     User management
 """
+
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from django.contrib.auth import login, logout, authenticate

src/workflow_app/workflow/states.py

@@ -4,6 +4,7 @@
     To add an action for a specific queue, add a StateAction class
     with the name of the queue in lower-case, replacing periods with underscores.
 """
+
 from .state_utilities import logged_action
 from .settings import POSTPROCESS_ERROR, CATALOG_DATA_READY
 from .settings import REDUCTION_DATA_READY, REDUCTION_CATALOG_DATA_READY

src/workflow_app/workflow/workflow_process.py

@@ -1,6 +1,7 @@
 """
     Actual process that each data run must go through.
 """
+
 import json
 import logging
 import datetime

tests/simple_producer.py

@@ -1,6 +1,7 @@
 """
     Example of a simple non-listening producer
 """
+
 import stomp
 import json
 import time

tests/test_autoreducer_high_memory.py

@@ -1,5 +1,6 @@
 """This is to test that the reduction tasks go to the correct autoreducer node
 depending on if it requires high memoery or not"""
+
 import psycopg2
 import requests
 import time

tests/workflow_command.py

@@ -2,6 +2,7 @@
     ActiveMQ client used to issue commands to the post-processing workflow.
     NOTE: Only works for runs that are already in the DB
 """
+
 from report.models import Instrument, DataRun
 from workflow.settings import BROKERS, ICAT_USER, ICAT_PASSCODE
 import argparse