Merge pull request #30 from pds-data-dictionaries/release/1.21.0.0

PDS4 Information Model Release 1.21.0.0

.github/workflows/build-docs.yml

@@ -32,9 +32,14 @@ jobs:
     if: github.actor != 'pdsen-ci'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
 
       - name: Install dependencies
         run: |
@@ -48,32 +53,32 @@ jobs:
           make github
           cd ..
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v3
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           # Upload entire repository
           path: '.'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v2
 
   pdfgen: # job 1
     name: 'Build PDF'
     runs-on: ubuntu-latest
     if: github.actor != 'pdsen-ci'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
 
       - name: Set up Python 3
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.9'
 
       - name: Install dependencies
         run: |

.github/workflows/release-ldd.yml

@@ -24,7 +24,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}
@@ -50,7 +50,7 @@ jobs:
       matrix: ${{fromJson(needs.get_versions.outputs.matrix)}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}

.github/workflows/submod-ci.yml

@@ -29,7 +29,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}
@@ -58,7 +58,7 @@ jobs:
       matrix: ${{fromJson(needs.get_versions.outputs.matrix)}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}
@@ -109,7 +109,7 @@ jobs:
     if: ${{ failure() && github.actor != 'pdsen-ci' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}
@@ -151,7 +151,7 @@ jobs:
     if: ${{ github.actor != 'pdsen-ci' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           ssh-key: ${{ secrets.SSH_KEY }}

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.17.0.0/PDS4_PROC_1H00_1300.csv → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.17.0.0/PDS4_PROC_1H00_1300.csv

@@ -12,6 +12,11 @@
 "proc:Software:2                       pds:name:1                          ","Attribute","name","n/a","pds","The name attribute provides a word or combination of words by which the object is known.","pds","UTF8_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:software_id:1                   ","Attribute","software_id","n/a","pds","The software id attribute provides a formal name used to refer to the software.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:software_version_id:1           ","Attribute","software_version_id","n/a","pds","The software_version_id attribute provides the version of the software.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
+"proc:Software:2                       proc:software_availability:1         ","Attribute","software_availability","n/a","proc","The software_availability attribute specifies the public availability/release status of the software.","en","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
+"proc:Software:2                       proc:software_availability:2          Value:Open source","Value","Open source","","","the software and its source code are freely available to the public"
+"proc:Software:2                       proc:software_availability:2          Value:Proprietary","Value","Proprietary","","","the software is proprietary, i.e. it may not be available to all members of the public or it might require a paid license"
+"proc:Software:2                       proc:software_availability:2          Value:Released","Value","Released","","","the software (but not its source code) is publicly available in some form"
+"proc:Software:2                       proc:software_availability:2          Value:Unreleased","Value","Unreleased","","","the software has not been published externally at all"
 "proc:Software:2                       pds:software_type:1                 ","Attribute","software_type","n/a","pds","The software type attribute identifies the class of which the software is a member.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:description:1                   ","Attribute","description","n/a","pds","The description attribute provides a statement, picture in words, or account that describes or is otherwise relevant to the object.","pds","UTF8_Text_Preserved","0","1","Unbounded","Unbounded","1","Unbounded","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software_Program:1              ","Class","Software_Program","1.0.0.0","proc","The Software_Program class describes the specific components or tasks of the Software executed in producing the data product.","en","","","","","","","","","","",""

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.17.0.0/PDS4_PROC_1H00_1300.sch → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.17.0.0/PDS4_PROC_1H00_1300.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 Schematron for Name Space Id:proc  Version:1.3.0.0 - Thu May 04 00:47:58 UTC 2023 -->
+  <!-- PDS4 Schematron for Name Space Id:proc  Version:1.3.0.0 - Wed Nov 08 16:15:48 UTC 2023 -->
   <!-- Generated from the PDS4 Information Model Version 1.17.0.0 - System Build 12.0 -->
   <!-- *** This PDS4 schematron file is an operational deliverable. *** -->
 <sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
@@ -60,11 +60,25 @@
         PROC:error: pds:reference_type must have value 'data_to_software'</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="//proc:Software/proc:software_availability">
+      <sch:assert test=". = ('Open source', 'Released', 'Proprietary', 'Unreleased')">
+        <title>//proc:Software/proc:software_availability/Rule</title>
+        PROC:error: The attribute proc:Software/proc:software_availability must be equal to one of the following values 'Open source', 'Released', 'Proprietary', 'Unreleased'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="proc:Parameter/proc:parameter_type">
       <sch:assert test=". = ('Input', 'Log', 'Output')">
         <title>proc:Parameter/proc:parameter_type/proc:parameter_type</title>
         The attribute proc:Parameter/proc:parameter_type must be equal to one of the following values 'Input', 'Log', 'Output'.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="proc:Software/proc:software_availability">
+      <sch:assert test=". = ('Open source', 'Proprietary', 'Released', 'Unreleased')">
+        <title>proc:Software/proc:software_availability/proc:software_availability</title>
+        The attribute proc:Software/proc:software_availability must be equal to one of the following values 'Open source', 'Proprietary', 'Released', 'Unreleased'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
 </sch:schema>

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.17.0.0/PDS4_PROC_1H00_1300.txt → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.17.0.0/PDS4_PROC_1H00_1300.txt

@@ -1,13 +1,13 @@
 PDS4 Local Data Dictionary Processing Report
 
 Configuration:
-   LDDTool Version        14.2.3
+   LDDTool Version        14.3.0
    LDD Version Id:        1.3.0.0
    LDD Label Version Id:  1.23
    LDD Discipline (T/F):  true
    LDD Namespace URL:     http://pds.nasa.gov/pds4/
    LDD URN Prefix:        urn:nasa:pds:
-   Time                   Thu May 04 00:47:58 UTC 2023
+   Time                   Wed Nov 08 16:15:48 UTC 2023
    Common Schema          [PDS4_PDS_1H00.xsd]
    Common Schematron      [PDS4_PDS_1H00.sch]
    IM Version Id:         1.17.0.0
@@ -30,8 +30,8 @@ Parameters:
 
 Summary:
    Classes                8
-   Attributes             10
-   Associations           39
+   Attributes             11
+   Associations           40
    Error messages         0
    Warning messages       0
    Information messages   0
@@ -66,13 +66,23 @@ Parsed Input - Header:
         - Reworded `Software` description
         - Removed child checking DD_Rules
         - Added new rules for reference_type and internal_reference_type checks
+
+        1.4.0.0 R.Joyner
+        - Update to 1.21.0.0 / 1.L.0.0
+        - Added software_availability as new attribute
+        - Edited definition of software_availability attribute to include enumerated values 
+
 
-
-   Last Modification Time 2022-06-08T20:00:00Z
+   Last Modification Time 2023-11-08T20:00:00Z
    PDS4 Merge Flag        false
 
 Parsed Input - Attributes:
 
+   name                   software_availability
+   version                1.17
+   value data type        ASCII_Short_String_Collapsed
+   description            The software_availability attribute specifies the public availability/release status of the software.
+
    name                   process_owner_name
    version                1.17
    value data type        ASCII_Short_String_Collapsed
@@ -255,6 +265,11 @@ Parsed Input - Classes:
       maximum occurrences   1
       reference type        attribute_of
 
+      local identifier      proc:software_availability
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
       local identifier      pds.software_type
       minimum occurrences   0
       maximum occurrences   1

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.17.0.0/PDS4_PROC_1H00_1300.xml → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.17.0.0/PDS4_PROC_1H00_1300.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 XML product label for PDS4 V1.17.0.0  Thu May 04 00:47:58 UTC 2023 -->
+  <!-- PDS4 XML product label for PDS4 V1.17.0.0  Wed Nov 08 16:15:48 UTC 2023 -->
   <!-- Generated from the PDS4 Information Model V1.17.0.0 - System Build 12.0 -->
   <!-- *** This PDS4 XML product label is an operational deliverable. *** -->
 <?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.sch"
@@ -17,7 +17,7 @@
         <product_class>Product_XML_Schema</product_class>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>2023-05-03</modification_date>
+                <modification_date>2023-11-08</modification_date>
                 <version_id>1.23</version_id>
                 <description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
             </Modification_Detail>
@@ -26,9 +26,9 @@
     <File_Area_XML_Schema>
         <File>
             <file_name>PDS4_PROC_1H00_1300.xsd</file_name>
-            <creation_date_time>2023-05-03T17:47:58</creation_date_time>
-            <file_size unit="byte">15351</file_size>
-            <records>324</records>
+            <creation_date_time>2023-11-08T08:15:49</creation_date_time>
+            <file_size unit="byte">16361</file_size>
+            <records>345</records>
         </File>
         <XML_Schema>
             <name>PDS4_PROC_1H00_1300.xsd</name>
@@ -40,9 +40,9 @@
     <File_Area_XML_Schema>
         <File>
             <file_name>PDS4_PROC_1H00_1300.sch</file_name>
-            <creation_date_time>2023-05-03T17:47:58</creation_date_time>
-            <file_size unit="byte">3769</file_size>
-            <records>70</records>
+            <creation_date_time>2023-11-08T08:15:49</creation_date_time>
+            <file_size unit="byte">4703</file_size>
+            <records>84</records>
         </File>
         <XML_Schema>
             <name>PDS4_PROC_1H00_1300.sch</name>

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.17.0.0/PDS4_PROC_1H00_1300.xsd → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.17.0.0/PDS4_PROC_1H00_1300.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 XML/Schema for Name Space Id:proc  Version:1.3.0.0 - Thu May 04 00:47:58 UTC 2023 -->
+  <!-- PDS4 XML/Schema for Name Space Id:proc  Version:1.3.0.0 - Wed Nov 08 16:15:48 UTC 2023 -->
   <!-- Generated from the PDS4 Information Model Version 1.17.0.0 - System Build 12.0 -->
   <!-- *** This PDS4 product schema is an operational deliverable. *** -->
   <!--                                                                           -->
@@ -41,7 +41,12 @@
         - Reworded `Software` description
         - Removed child checking DD_Rules
         - Added new rules for reference_type and internal_reference_type checks
-
+
+        1.4.0.0 R.Joyner
+        - Update to 1.21.0.0 / 1.L.0.0
+        - Added software_availability as new attribute
+        - Edited definition of software_availability attribute to include enumerated values 
+
 
     </xs:documentation>
   </xs:annotation>
@@ -155,11 +160,15 @@
       <xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element name="software_id" type="pds:software_id" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element name="software_version_id" type="pds:software_version_id" minOccurs="0" maxOccurs="1"> </xs:element>
+      <xs:element name="software_availability" type="proc:software_availability" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element name="software_type" type="pds:software_type" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element name="description" type="pds:description" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
       <xs:element name="Software_Program" type="proc:Software_Program" minOccurs="0" maxOccurs="unbounded"> </xs:element>
     </xs:sequence>
+    <!-- Begin assert statements for schematron - Enumerated Values -->
+    <!-- <xs:assert test="proc:software_availability = ('Open source', 'Proprietary', 'Released', 'Unreleased')"/> -->
+    <!-- End assert statements for schematron - Enumerated Values -->
   </xs:complexType>
 
   <xs:complexType name="Software_Program">
@@ -321,4 +330,16 @@
      <xs:maxLength value="255"/>
 	   </xs:restriction>
   </xs:simpleType>
+
+  <xs:simpleType name="software_availability">
+    <xs:annotation>
+      <xs:documentation>The software_availability attribute specifies
+        the public availability/release status of the
+        software.</xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="pds:ASCII_Short_String_Collapsed">
+     <xs:minLength value="1"/>
+     <xs:maxLength value="255"/>
+	   </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

build/development/d979f25c85a026aaa544b247ebbfdca65d5fb32b/1.18.0.0/PDS4_PROC_1I00_1300.csv → build/development/1e7ac520e37f6bf95675755187d5bc637401f423/1.18.0.0/PDS4_PROC_1I00_1300.csv

@@ -12,6 +12,11 @@
 "proc:Software:2                       pds:name:1                          ","Attribute","name","n/a","pds","The name attribute provides a word or combination of words by which the object is known.","pds","UTF8_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:software_id:1                   ","Attribute","software_id","n/a","pds","The software id attribute provides a formal name used to refer to the software.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:software_version_id:1           ","Attribute","software_version_id","n/a","pds","The software_version_id attribute provides the version of the software.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
+"proc:Software:2                       proc:software_availability:1         ","Attribute","software_availability","n/a","proc","The software_availability attribute specifies the public availability/release status of the software.","en","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
+"proc:Software:2                       proc:software_availability:2          Value:Open source","Value","Open source","","","the software and its source code are freely available to the public"
+"proc:Software:2                       proc:software_availability:2          Value:Proprietary","Value","Proprietary","","","the software is proprietary, i.e. it may not be available to all members of the public or it might require a paid license"
+"proc:Software:2                       proc:software_availability:2          Value:Released","Value","Released","","","the software (but not its source code) is publicly available in some form"
+"proc:Software:2                       proc:software_availability:2          Value:Unreleased","Value","Unreleased","","","the software has not been published externally at all"
 "proc:Software:2                       pds:software_type:1                 ","Attribute","software_type","n/a","pds","The software type attribute identifies the class of which the software is a member.","ops","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software:2                       pds:description:1                   ","Attribute","description","n/a","pds","The description attribute provides a statement, picture in words, or account that describes or is otherwise relevant to the object.","pds","UTF8_Text_Preserved","0","1","Unbounded","Unbounded","1","Unbounded","Units_of_None","none","TBD_classConcept","TBD_dataConcept"
 "proc:Software_Program:1              ","Class","Software_Program","1.0.0.0","proc","The Software_Program class describes the specific components or tasks of the Software executed in producing the data product.","en","","","","","","","","","","",""