Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.4rc5 #33

Merged
merged 6 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.6
rev: v0.6.1
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
3 changes: 2 additions & 1 deletion src/apps/plots/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from apps.plots.models import DataRun, Instrument, PlotData
from django.contrib import admin

from apps.plots.models import DataRun, Instrument, PlotData


class PlotDataAdmin(admin.ModelAdmin):
readonly_fields = ("data_run",)
Expand Down
3 changes: 2 additions & 1 deletion src/apps/plots/management/commands/purge_expired_data.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from apps.plots.models import DataRun
from django.core.management.base import BaseCommand
from django.utils import timezone

from apps.plots.models import DataRun


class Command(BaseCommand):
help = "Delete expired runs and related plots"
Expand Down
3 changes: 2 additions & 1 deletion src/apps/plots/view_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
from datetime import datetime
from typing import Optional

from apps.plots.models import DataRun, Instrument, PlotData
from django.conf import settings
from django.http import HttpResponse
from django.utils import timezone

from apps.plots.models import DataRun, Instrument, PlotData


def generate_key(instrument, run_id):
"""
Expand Down
3 changes: 2 additions & 1 deletion src/apps/plots/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import logging
from datetime import timedelta

from apps.plots.models import DataRun, Instrument, PlotData
from django.conf import settings
from django.contrib.auth import authenticate, login
from django.http import HttpResponse, HttpResponseNotFound, JsonResponse
Expand All @@ -15,6 +14,8 @@
from django.views.decorators.cache import cache_page
from django.views.decorators.csrf import csrf_exempt

from apps.plots.models import DataRun, Instrument, PlotData

from . import view_util


Expand Down
Loading