Rename from secop to frappy
debian/ is still missing, will follow in next commit. Fixes: #4626 Change-Id: Ia87c28c1c75b8402eedbfca47f888585a7881f44
This commit is contained in:

committed by
Enrico Faulhaber

parent
c1eb764b09
commit
7f166a5b8c
@ -20,8 +20,8 @@
|
||||
#
|
||||
# *****************************************************************************
|
||||
|
||||
from secop.modules import Module, Attached
|
||||
from secop.protocol.dispatcher import Dispatcher
|
||||
from frappy.modules import Module, Attached
|
||||
from frappy.protocol.dispatcher import Dispatcher
|
||||
|
||||
|
||||
# class DispatcherStub:
|
||||
|
@ -25,12 +25,12 @@
|
||||
# no fixtures needed
|
||||
import pytest
|
||||
|
||||
from secop.datatypes import ArrayOf, BLOBType, BoolType, \
|
||||
from frappy.datatypes import ArrayOf, BLOBType, BoolType, \
|
||||
CommandType, ConfigError, DataType, Enum, EnumType, FloatRange, \
|
||||
IntRange, ProgrammingError, ScaledInteger, StatusType, \
|
||||
StringType, StructOf, TextType, TupleOf, get_datatype, \
|
||||
DiscouragedConversion
|
||||
from secop.lib import generalConfig
|
||||
from frappy.lib import generalConfig
|
||||
|
||||
|
||||
def copytest(dt):
|
||||
|
@ -21,10 +21,10 @@
|
||||
# *****************************************************************************
|
||||
"""test data types."""
|
||||
|
||||
import secop.errors
|
||||
import frappy.errors
|
||||
|
||||
|
||||
def test_errors():
|
||||
"""check consistence of secop.errors.EXCEPTIONS"""
|
||||
for e in secop.errors.EXCEPTIONS.values():
|
||||
assert secop.errors.EXCEPTIONS[e().name] == e
|
||||
"""check consistence of frappy.errors.EXCEPTIONS"""
|
||||
for e in frappy.errors.EXCEPTIONS.values():
|
||||
assert frappy.errors.EXCEPTIONS[e().name] == e
|
||||
|
@ -21,9 +21,9 @@
|
||||
# *****************************************************************************
|
||||
|
||||
|
||||
from secop.rwhandler import ReadHandler, WriteHandler, \
|
||||
from frappy.rwhandler import ReadHandler, WriteHandler, \
|
||||
CommonReadHandler, CommonWriteHandler, nopoll
|
||||
from secop.core import Module, Parameter, FloatRange, Done
|
||||
from frappy.core import Module, Parameter, FloatRange, Done
|
||||
|
||||
|
||||
class DispatcherStub:
|
||||
|
@ -25,7 +25,7 @@
|
||||
# no fixtures needed
|
||||
import pytest
|
||||
|
||||
from secop.lib.enum import Enum, EnumMember
|
||||
from frappy.lib.enum import Enum, EnumMember
|
||||
|
||||
|
||||
def test_EnumMember():
|
||||
|
@ -22,11 +22,11 @@
|
||||
|
||||
import pytest
|
||||
import mlzlog
|
||||
from secop.modules import Module
|
||||
from secop.protocol.dispatcher import Dispatcher
|
||||
from secop.protocol.interface import encode_msg_frame, decode_msg
|
||||
import secop.logging
|
||||
from secop.logging import logger, generalConfig, HasComlog
|
||||
from frappy.modules import Module
|
||||
from frappy.protocol.dispatcher import Dispatcher
|
||||
from frappy.protocol.interface import encode_msg_frame, decode_msg
|
||||
import frappy.logging
|
||||
from frappy.logging import logger, generalConfig, HasComlog
|
||||
|
||||
|
||||
class ServerStub:
|
||||
@ -89,8 +89,8 @@ def init_(monkeypatch):
|
||||
close = flush = emit = noop
|
||||
|
||||
monkeypatch.setattr(mlzlog, 'ColoredConsoleHandler', ConsoleHandler)
|
||||
monkeypatch.setattr(secop.logging, 'ComLogfileHandler', ComLogHandler)
|
||||
monkeypatch.setattr(secop.logging, 'LogfileHandler', LogfileHandler)
|
||||
monkeypatch.setattr(frappy.logging, 'ComLogfileHandler', ComLogHandler)
|
||||
monkeypatch.setattr(frappy.logging, 'LogfileHandler', LogfileHandler)
|
||||
|
||||
class Mod(Module):
|
||||
result = []
|
||||
|
@ -26,12 +26,12 @@ import sys
|
||||
import threading
|
||||
import pytest
|
||||
|
||||
from secop.datatypes import BoolType, FloatRange, StringType, IntRange, ScaledInteger
|
||||
from secop.errors import ProgrammingError, ConfigError
|
||||
from secop.modules import Communicator, Drivable, Readable, Module
|
||||
from secop.params import Command, Parameter
|
||||
from secop.rwhandler import ReadHandler, WriteHandler, nopoll
|
||||
from secop.lib import generalConfig
|
||||
from frappy.datatypes import BoolType, FloatRange, StringType, IntRange, ScaledInteger
|
||||
from frappy.errors import ProgrammingError, ConfigError
|
||||
from frappy.modules import Communicator, Drivable, Readable, Module
|
||||
from frappy.params import Command, Parameter
|
||||
from frappy.rwhandler import ReadHandler, WriteHandler, nopoll
|
||||
from frappy.lib import generalConfig
|
||||
|
||||
|
||||
class DispatcherStub:
|
||||
@ -668,7 +668,7 @@ def test_problematic_value_range():
|
||||
({'value.unit': 'K', 'someparam.unit': 'A'}, 'C', 'C', 'A'),
|
||||
])
|
||||
def test_deferred_main_unit(config, dynamicunit, finalunit, someunit):
|
||||
# this pattern is used in secop_mlz.entangle.AnalogInput
|
||||
# this pattern is used in frappy_mlz.entangle.AnalogInput
|
||||
class Mod(Drivable):
|
||||
ramp = Parameter('', datatype=FloatRange(unit='$/min'))
|
||||
someparam = Parameter('', datatype=FloatRange(unit='$'))
|
||||
|
@ -23,8 +23,8 @@
|
||||
|
||||
import pytest
|
||||
|
||||
import secop.protocol.messages as m
|
||||
from secop.protocol.interface import decode_msg, encode_msg_frame
|
||||
import frappy.protocol.messages as m
|
||||
from frappy.protocol.interface import decode_msg, encode_msg_frame
|
||||
|
||||
# args are: msg tuple, msg bytes
|
||||
MSG = [
|
||||
|
@ -21,7 +21,7 @@
|
||||
# *****************************************************************************
|
||||
|
||||
import time
|
||||
from secop.lib.multievent import MultiEvent
|
||||
from frappy.lib.multievent import MultiEvent
|
||||
|
||||
|
||||
def test_without_timeout():
|
||||
|
@ -25,10 +25,10 @@
|
||||
# no fixtures needed
|
||||
import pytest
|
||||
|
||||
from secop.datatypes import BoolType, FloatRange, IntRange
|
||||
from secop.errors import ProgrammingError
|
||||
from secop.modules import HasAccessibles
|
||||
from secop.params import Command, Parameter
|
||||
from frappy.datatypes import BoolType, FloatRange, IntRange
|
||||
from frappy.errors import ProgrammingError
|
||||
from frappy.modules import HasAccessibles
|
||||
from frappy.params import Command, Parameter
|
||||
|
||||
|
||||
def test_Command():
|
||||
|
@ -27,7 +27,7 @@ from collections import OrderedDict
|
||||
|
||||
import pytest
|
||||
|
||||
from secop.parse import Parser
|
||||
from frappy.parse import Parser
|
||||
|
||||
|
||||
# pylint: disable=redefined-outer-name
|
||||
|
@ -29,8 +29,8 @@ import logging
|
||||
|
||||
import pytest
|
||||
|
||||
from secop.core import Module, Parameter, FloatRange, Readable, ReadHandler, nopoll
|
||||
from secop.lib.multievent import MultiEvent
|
||||
from frappy.core import Module, Parameter, FloatRange, Readable, ReadHandler, nopoll
|
||||
from frappy.lib.multievent import MultiEvent
|
||||
|
||||
|
||||
class Time:
|
||||
|
@ -23,10 +23,10 @@
|
||||
|
||||
import pytest
|
||||
|
||||
from secop.datatypes import FloatRange, IntRange, StringType, ValueType
|
||||
from secop.errors import BadValueError, ConfigError, ProgrammingError
|
||||
from secop.properties import HasProperties, Property
|
||||
from secop.core import Parameter
|
||||
from frappy.datatypes import FloatRange, IntRange, StringType, ValueType
|
||||
from frappy.errors import BadValueError, ConfigError, ProgrammingError
|
||||
from frappy.properties import HasProperties, Property
|
||||
from frappy.core import Parameter
|
||||
|
||||
|
||||
def Prop(*args, name=None, **kwds):
|
||||
|
@ -21,7 +21,7 @@
|
||||
# *****************************************************************************
|
||||
|
||||
|
||||
from secop.lib.statemachine import StateMachine, Stop, Retry
|
||||
from frappy.lib.statemachine import StateMachine, Stop, Retry
|
||||
|
||||
|
||||
def rise(state):
|
||||
|
Reference in New Issue
Block a user