Skip to content

Commit

Permalink
bug fixes for github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
fred3m committed Jul 2, 2024
1 parent 59e2f6a commit 3ada940
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 18 deletions.
3 changes: 1 addition & 2 deletions python/lsst/rubintv/analysis/service/commands/butler.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
from dataclasses import dataclass
from typing import TYPE_CHECKING

from lsst.obs.lsst import LsstCam, LsstComCam, Latiss
from lsst.afw.cameraGeom import FOCAL_PLANE, Camera, Detector

from lsst.obs.lsst import Latiss, LsstCam, LsstComCam

from ..command import BaseCommand

Expand Down
6 changes: 3 additions & 3 deletions python/lsst/rubintv/analysis/service/commands/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@

from __future__ import annotations

from dataclasses import dataclass
import logging
from dataclasses import dataclass
from typing import TYPE_CHECKING

from lsst.obs.lsst import LsstCam, LsstComCam, Latiss, LsstComCamSim
from lsst.afw.cameraGeom import FOCAL_PLANE
from lsst.obs.lsst import Latiss, LsstCam, LsstComCam, LsstComCamSim

from ..command import BaseCommand
from ..query import EqualityQuery, ParentQuery, Query
from ..database import exposure_tables, visit1_tables
from ..query import EqualityQuery, ParentQuery, Query

if TYPE_CHECKING:
from ..data import DataCenter
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/rubintv/analysis/service/commands/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

from __future__ import annotations

from dataclasses import dataclass
import logging
from dataclasses import dataclass

from lsst.rubintv.analysis.service.data import DataCenter

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/rubintv/analysis/service/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

from __future__ import annotations

from abc import ABC, abstractmethod
import logging
from abc import ABC, abstractmethod
from typing import cast

import sqlalchemy
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/rubintv/analysis/service/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from enum import Enum
import logging
from enum import Enum

__all__ = ["ServerFormatter"]

Expand Down
8 changes: 4 additions & 4 deletions python/lsst/rubintv/analysis/service/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
from dataclasses import dataclass

import datetime
from dataclasses import dataclass
from typing import Any

import numpy as np
import scipy.ndimage
from lsst.geom import Box2I
from matplotlib import cm as cmap
from matplotlib.colors import Normalize
import scipy.ndimage
from PIL import Image

from lsst.geom import Box2I

# It may be desirabe in the future to allow users to choose
# what type of image they want to send to the client.
# For now the default is sent to png.
Expand Down
2 changes: 1 addition & 1 deletion scripts/joins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ joins:
ccdexposure:
- exposure_id
visit1_quicklook:
- visit_id
- visit_id
4 changes: 1 addition & 3 deletions scripts/mock_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,17 @@
from __future__ import annotations

import argparse
import logging
import uuid
from dataclasses import dataclass
from enum import Enum
import logging

import tornado.httpserver
import tornado.ioloop
import tornado.web
import tornado.websocket

from lsst.rubintv.analysis.service.utils import ServerFormatter


logger = logging.getLogger("lsst.rubintv.analysis.service.server")


Expand Down
2 changes: 0 additions & 2 deletions scripts/rubintv_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@
import sqlalchemy
import yaml
from lsst.daf.butler import Butler

from lsst.rubintv.analysis.service.data import DataCenter, DataMatch
from lsst.rubintv.analysis.service.database import ConsDbSchema
from lsst.rubintv.analysis.service.efd import EfdClient
from lsst.rubintv.analysis.service.utils import ServerFormatter
from lsst.rubintv.analysis.service.worker import Worker


default_config = os.path.join(pathlib.Path(__file__).parent.absolute(), "config.yaml")
default_joins = os.path.join(pathlib.Path(__file__).parent.absolute(), "joins.yaml")
logger = logging.getLogger("lsst.rubintv.analysis.server.worker")
Expand Down
1 change: 1 addition & 0 deletions ups/rubintv_analysis_service.table
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# - Common third-party packages can be assumed to be recursively included by
# the "base" package.
setupRequired(lsst_distrib)
setupRequired(obs_lsst)

# The following is boilerplate for all packages.
# See https://dmtn-001.lsst.io for details on LSST_LIBRARY_PATH.
Expand Down

0 comments on commit 3ada940

Please sign in to comment.