Skip to content

Commit 99fec8c

Browse files
authored
Merge pull request #2338 from microbiomedata/2336-deprecate-protocolexecution
Deprecate `ProtocolExecution` class and related slots
2 parents 4f3c4f3 + 0728776 commit 99fec8c

7 files changed

+4
-87
lines changed

project.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ local/mongo_as_unvalidated_nmdc_database.yaml:
159159
--selected-collections instrument_set \
160160
--selected-collections material_processing_set \
161161
--selected-collections processed_sample_set \
162-
--selected-collections protocol_execution_set \
163162
--selected-collections storage_process_set \
164163
--selected-collections study_set \
165164
--selected-collections workflow_execution_set \

src/data/invalid/ProtocolExecution-inlined_not_valid.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/data/valid/Database-NOM-material-processing.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -116,30 +116,3 @@ material_processing_set:
116116
type: nmdc:QuantityValue
117117
has_unit: 'uL'
118118
has_numeric_value: 5
119-
protocol_execution_set:
120-
- id: nmdc:pex-12-123
121-
type: nmdc:ProtocolExecution
122-
has_input:
123-
- nmdc:bsm-00-435737
124-
has_process_parts:
125-
- nmdc:dispro-99-123
126-
- nmdc:chcpr-99-123
127-
- nmdc:filtpr-00-123
128-
protocol_execution_category: organic_matter_extraction
129-
protocol_link:
130-
type: nmdc:Protocol
131-
name: Organic Matter Extraction Analytical Processes
132-
url: https://pnnl.sharepoint.com/:w:/r/sites/EMSL/_layouts/15/Doc.aspx?sourcedoc=%7B06286DC5-9E52-4CF9-B583-F8BE695F60D9%7D&file=Protocol_WEOM.docx&action=default&mobileredirect=true
133-
- id: nmdc:pex-12-3456
134-
type: nmdc:ProtocolExecution
135-
has_input:
136-
- nmdc:procsm-00-3
137-
has_process_parts:
138-
- nmdc:cspro-99-456
139-
- nmdc:dispro-99-456
140-
- nmdc:chcpr-99-456
141-
protocol_execution_category: solid_phase_extraction
142-
protocol_link:
143-
type: nmdc:Protocol
144-
name: Organic Matter Solid Phase Extraction Analytical Processes
145-
url: https://pnnl.sharepoint.com/sites/EMSL/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2FEMSL%2FShared%20Documents%2FScience%20and%20Technology%2FScience%20Areas%2FEnvironmental%20Transformations%20%26%20Interactions%20Group%2FResearch%20Campaigns%2FFY21%2F1000%20Soil%20Pilot%2Fprotocols%2FFTICR%2DMS%2FFTICRMS%2DGilsonAutomatedSPESOP%2D130521%2D1547%2D150%2Epdf&parent=%2Fsites%2FEMSL%2FShared%20Documents%2FScience%20and%20Technology%2FScience%20Areas%2FEnvironmental%20Transformations%20%26%20Interactions%20Group%2FResearch%20Campaigns%2FFY21%2F1000%20Soil%20Pilot%2Fprotocols%2FFTICR%2DMS

src/data/valid/Database-interleaved.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,6 @@ storage_process_set:
109109
- nmdc:procsm-78-BZAPKH
110110
type: nmdc:StorageProcess
111111

112-
protocol_execution_set:
113-
- id: nmdc:pex-99-18sD2
114-
type: nmdc:ProtocolExecution
115-
has_input:
116-
- nmdc:bsm-65-0002
117-
has_process_parts:
118-
- nmdc:extrp-71-r2pk
119-
- nmdc:filtpr-22-32G2BS
120-
protocol_execution_category: organic_matter_extraction
121-
protocol_link:
122-
type: nmdc:Protocol
123-
url: https://www.protocols.io/view/water-extractable-organic-matter-weom-ewov1o4oylr2/v1
124-
name: Water Extractable Organic Matter (WEOM)
125112
material_processing_set:
126113
- id: nmdc:cspro-99-xyzxyz
127114
type: nmdc:ChromatographicSeparationProcess

src/data/valid/ProtocolExecution-minimal.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/data/valid/ProtocolExecution-single_step.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/schema/nmdc.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ classes:
349349
- manifest_set
350350
- material_processing_set
351351
- processed_sample_set
352-
- protocol_execution_set
353352
- storage_process_set
354353
- study_set
355354
- workflow_execution_set
@@ -503,6 +502,7 @@ classes:
503502
syntax: "{id_nmdc_prefix}:(extrp|filtpr|dispro|poolp|libprp|subspr|mixpro|chcpr|cspro)-{id_shoulder}-{id_blade}$"
504503
interpolated: true
505504
description: The MaterialProcessing steps that are discrete parts of the ProtocolExecution.
505+
deprecated: "not used, not fulfilling intended purpose https://github.com/microbiomedata/nmdc-schema/issues/2336"
506506

507507
SubSamplingProcess:
508508
class_uri: 'nmdc:SubSamplingProcess'
@@ -1239,6 +1239,7 @@ slots:
12391239
mixins: object_set
12401240
range: ProtocolExecution
12411241
description: This property links a database object to the set of protocol executions within it.
1242+
deprecated: "not used https://github.com/microbiomedata/nmdc-schema/issues/2336"
12421243

12431244
storage_process_set:
12441245
mixins: object_set
@@ -1280,13 +1281,15 @@ slots:
12801281
protocol_execution_category:
12811282
range: ProtocolCategoryEnum
12821283
required: true
1284+
deprecated: "not used https://github.com/microbiomedata/nmdc-schema/issues/2336"
12831285

12841286
has_process_parts:
12851287
range: PlannedProcess
12861288
description: A list of process parts that make up a protocol.
12871289
required: true
12881290
multivalued: true
12891291
list_elements_ordered: true
1292+
deprecated: "not used https://github.com/microbiomedata/nmdc-schema/issues/2336"
12901293

12911294
filter_material:
12921295
description: "A porous material on which solid particles present in air or other fluid which flows through it are largely caught and retained."

0 commit comments

Comments
 (0)