Skip to content
Snippets Groups Projects

Show unit test reports in Gitlab

Merged Daniel Lyons requested to merge show-unit-test-reports-in-gitlab into 2.8.4-DEVELOPMENT
4 unresolved threads
Compare and Show latest version
1 file
+ 12
7
Compare changes
  • Side-by-side
  • Inline
@@ -37,8 +37,6 @@ from pycapo import CapoConfig
from sqlalchemy.ext.mutable import MutableDict
from sqlalchemy.ext.orderinglist import ordering_list
from sqlalchemy.orm import registry, relationship
from sqlalchemy.ext.declarative import declarative_base
from workspaces.capability.enums import (
CapabilityRequestState,
@@ -52,7 +50,8 @@ from workspaces.products.schema_interfaces import FutureProductIF
from workspaces.system.schema import AbstractFile, JSONSerializable
mapper_registry = registry()
Base = declarative_base()
Base = mapper_registry.generate_base()
logger = logging.getLogger(__name__)
CAPABILITY_NAME_FK = "capabilities.capability_name"
@@ -974,6 +973,12 @@ matrix_capabilities = sa.Table(
Base.metadata,
sa.Column("matrix_id", sa.Integer, sa.ForeignKey("casa_matrix_casa_versions.matrix_id")),
sa.Column("capability_name", sa.String, sa.ForeignKey("capabilities.capability_name")),
sa.ForeignKeyConstraint(
["matrix_id"], ["casa_matrix_casa_versions.matrix_id"], name="casa_matrix_capabilities_matrix_id_fkey"
),
sa.ForeignKeyConstraint(
["capability_name"], ["capabilities.capability_name"], name="casa_matrix_capabilities_capability_name_fkey"
),
)
@@ -1005,7 +1010,7 @@ class CasaMatrixCasaVersion(JSONSerializable):
sa.Boolean,
default=True,
)
capabilities = relationship("Capability", back_populates="casa_matrix_casa_versions", secondary=matrix_capabilities)
capabilities = relationship("Capability", back_populates="casa_versions", secondary=matrix_capabilities)
# Pyramid support method: must accept a "request" argument that is unused by us
def __json__(self, request=None) -> dict:
@@ -1024,7 +1029,7 @@ class CasaMatrixCasaVersion(JSONSerializable):
@mapper_registry.mapped
class Capability(JSONSerializable):
class Capability(JSONSerializable, Base):
"""
A capability, which is a particular workflow setup, intended to accept
a certain kind of product and some parameters and produce another product
@@ -1055,8 +1060,8 @@ class Capability(JSONSerializable):
templates = relationship("CapabilityTemplate", backref="capabilities", lazy="dynamic")
requests = relationship("CapabilityRequest", back_populates="capability")
state_machine = relationship("StateMachine", back_populates="capability", uselist=False)
matrix_casa_versions = relationship(
"CasaMatrixCasaVersion", bac_populates="capabilities", lazy=True, secondary=matrix_capabilities
casa_versions = relationship(
"CasaMatrixCasaVersion", back_populates="capabilities", lazy=True, secondary=matrix_capabilities
)
def create_request(self, parameters: ParameterIF, future_products: FutureProductIF):
Loading