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

Prepare for release of v1.1.0 #69

Merged
merged 17 commits into from
Mar 4, 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 .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.1.0
File renamed without changes.
89 changes: 46 additions & 43 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
from unittest.mock import MagicMock

import pytest
from data.examples_create_labware_messages import TEST_CREATE_LABWARE_MSG_OBJECT, TEST_INVALID_CREATE_LABWARE_MSG_OBJECT
from tests.data.examples_create_labware_messages import (
TEST_CREATE_LABWARE_MSG_OBJECT,
TEST_INVALID_CREATE_LABWARE_MSG_OBJECT,
)
from lab_share_lib.constants import RABBITMQ_HEADER_KEY_SUBJECT, RABBITMQ_HEADER_KEY_VERSION
from lab_share_lib.processing.rabbit_message import RabbitMessage

from tol_lab_share.helpers import get_config
from tol_lab_share.messages.output_feedback_message import OutputFeedbackMessage
from tol_lab_share.messages.rabbit.published import CreateLabwareFeedbackMessage

CONFIG = get_config("tol_lab_share.config.test")
logging.config.dictConfig(CONFIG.LOGGING)
Expand Down Expand Up @@ -91,7 +94,7 @@ def traction_qc_success_response():

@pytest.fixture()
def valid_feedback_message():
instance = OutputFeedbackMessage()
instance = CreateLabwareFeedbackMessage()
instance.count_of_total_samples = 0
instance.count_of_valid_samples = 0
instance.source_message_uuid = b"b01aa0ad-7b19-4f94-87e9-70d74fb8783c"
Expand Down Expand Up @@ -123,64 +126,64 @@ def taxonomy_record():
@pytest.fixture
def valid_sample():
return {
"sampleUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e0f6".encode(),
"studyUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e014".encode(),
"sangerSampleId": "cichlid_pacbio8196429",
"location": "A01",
"supplierSampleName": "SampleSupplied1",
"volume": "5",
"concentration": "5",
"publicName": "SamplePublicName1",
"taxonId": "10090",
"accessionNumber": "EE1234",
"commonName": "Mus Musculus",
"donorId": "cichlid_pacbio8196429",
"libraryType": "Library1",
"concentration": "5",
"costCode": "S1234",
"countryOfOrigin": "United Kingdom",
"dateSubmittedUTC": datetime.utcnow(),
"donorId": "cichlid_pacbio8196429",
"finalNanoDrop": "150",
"finalNanoDrop230": "200",
"finalNanoDrop280": "200",
"genomeSize": "14",
"accessionNumber": "EE1234",
"sampleCollectionDateUtc": datetime.utcnow(),
"costCode": "S1234",
"shearedFemtoFragmentSize": "8",
"libraryType": "Library1",
"location": "A01",
"postSPRIConcentration": "9",
"postSPRIVolume": "10",
"finalNanoDrop280": "200",
"finalNanoDrop230": "200",
"finalNanoDrop": "150",
"shearingAndQCComments": "",
"dateSubmittedUTC": datetime.utcnow(),
"priorityLevel": "Medium",
"publicName": "SamplePublicName1",
"sampleCollectionDateUtc": datetime.utcnow(),
"sampleUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e0f6".encode(),
"sangerSampleId": "cichlid_pacbio8196429",
"shearedFemtoFragmentSize": "8",
"shearingAndQCComments": "",
"studyUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e014".encode(),
"supplierSampleName": "SampleSupplied1",
"taxonId": "10090",
"volume": "5",
}


@pytest.fixture
def invalid_sample():
return {
"sampleUuid": b"dd490ee5-fd1d-456d-99fd-eb9d3861e0f6",
"studyUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e014",
"sangerSampleId": 1234,
"location": "A001",
"supplierSampleName": "1234",
"volume": "ee5",
"concentration": "ee5",
"publicName": "1234",
"taxonId": "ee10090",
"accessionNumber": "EE1234",
"commonName": 1234,
"donorId": 1234,
"libraryType": 1234,
"concentration": "ee5",
"costCode": 1234,
"countryOfOrigin": 1234,
"dateSubmittedUTC": datetime.utcnow(),
"donorId": 1234,
"finalNanoDrop": "150",
"finalNanoDrop230": 200,
"finalNanoDrop280": 200,
"genomeSize": "14",
"accessionNumber": "EE1234",
"costCode": 1234,
"sampleCollectionDateUtc": datetime.utcnow(),
"shearedFemtoFragmentSize": "8",
"libraryType": 1234,
"location": "A001",
"postSPRIConcentration": "9",
"postSPRIVolume": "10",
"finalNanoDrop280": 200,
"finalNanoDrop230": 200,
"finalNanoDrop": "150",
"shearingAndQCComments": "",
"dateSubmittedUTC": datetime.utcnow(),
"priorityLevel": "Medium",
"publicName": "1234",
"sampleCollectionDateUtc": datetime.utcnow(),
"sampleUuid": b"dd490ee5-fd1d-456d-99fd-eb9d3861e0f6",
"sangerSampleId": 1234,
"shearedFemtoFragmentSize": "8",
"shearingAndQCComments": "",
"studyUuid": "dd490ee5-fd1d-456d-99fd-eb9d3861e014",
"supplierSampleName": "1234",
"taxonId": "ee10090",
"volume": "ee5",
}


Expand Down
67 changes: 0 additions & 67 deletions tests/message_properties/definitions/helpers.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_accesion_number.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_barcode.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_common_name.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_concentration.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_cost_code.py

This file was deleted.

28 changes: 0 additions & 28 deletions tests/message_properties/definitions/test_country_of_origin.py

This file was deleted.

39 changes: 0 additions & 39 deletions tests/message_properties/definitions/test_date_utc.py

This file was deleted.

33 changes: 0 additions & 33 deletions tests/message_properties/definitions/test_dict_input.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_donor_id.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/message_properties/definitions/test_genome_size.py

This file was deleted.

17 changes: 0 additions & 17 deletions tests/message_properties/definitions/test_input.py

This file was deleted.

Loading
Loading