Merge pull request #4 from nasa/devel

Fetch upstream F' into serial default changes
timcanham · Jun 8, 2021 · 657bb61 · 657bb61
2 parents 763360c + eebef10
commit 657bb61
Show file tree

Hide file tree

Showing 435 changed files with 571 additions and 655 deletions.
diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile
@@ -1,7 +1,12 @@
 FROM nasafprime/fprime-base:latest
 
 # Copies your code file from your action repository to the filesystem path `/` of the container
+USER root
+RUN  apt-get update && apt-get install -y --no-install-recommends doxygen && \
+     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && pip3 --no-cache-dir install fprime-tools fprime-gds
 COPY entrypoint.sh /entrypoint.sh
+COPY autodoc.bash /autodoc.bash
+USER fprime
 
 # Code file to execute when the docker container starts up (`entrypoint.sh`)
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/.github/actions/autodoc.bash b/.github/actions/autodoc.bash
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Exit when any command fails
+set -e
+set -x
+
+cd "$GITHUB_WORKSPACE"
+REMOTE="${1:-origin}"
+git config --local user.email "nasa-fprime[bot]@users.noreply.github.com"
+git config --local user.name "nasa-fprime[bot]"
+git fetch "${REMOTE}" release/documentation
+git fetch "${REMOTE}" devel
+git checkout release/documentation
+git merge "${REMOTE}"/devel
+${GITHUB_WORKSPACE}/docs/doxygen/generate_docs.bash
+git add -Af "${GITHUB_WORKSPACE}/docs"
+
+
+git commit -m "Autodoc on $(date)" 1>/dev/null
+git push "${REMOTE}"
diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh
@@ -2,7 +2,12 @@
 
 # Exit when any command fails
 set -e
-
+set -x
 cd "$GITHUB_WORKSPACE"
-"$GITHUB_WORKSPACE/ci/master.bash" QUICK
-"$GITHUB_WORKSPACE/ci/master.bash" STATIC
+if [ "$GITHUB_WORKFLOW" != "Autodocs" ]
+then
+    "$GITHUB_WORKSPACE/ci/master.bash" QUICK
+    "$GITHUB_WORKSPACE/ci/master.bash" STATIC
+else
+    /autodoc.bash
+fi
diff --git a/.github/actions/github-autodocs.yml b/.github/actions/github-autodocs.yml
@@ -0,0 +1,9 @@
+name: 'fprime Automatic Documentation'
+description: 'Runs continuous documentation updates on fprime'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  entrypoint: '/autodoc.bash'
+with:
+  github_token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -616,7 +616,6 @@ gcgandhi
 gcov
 gdiplus
 gencode
-gendoc
 genfile
 GENHUB
 GENREP
@@ -882,7 +881,6 @@ LCHILD
 ldl
 lemstarch
 len
-leq
 lestarch
 levelname
 lflag
@@ -1073,6 +1071,7 @@ Nicolich
 ninjaaron
 nio
 NMEA
+nmsgs
 noargport
 NOBUFFERS
 NOCOLOR
@@ -1086,6 +1085,7 @@ noncomma
 nondetached
 NONINFRINGEMENT
 Nop
+noreturn
 normalwidths
 normpath
 NOSEQUENCEACTIVE
@@ -1330,7 +1330,7 @@ Rcv
 rcvd
 RCVTIMEO
 RDONLY
-RDWR
+rdwr
 Readback
 readdir
 READERROR
@@ -1816,6 +1816,7 @@ vals
 valud
 ve
 venv
+VERSIONED
 versioning
 VFILE
 vhd

diff --git a/.github/workflows/autodocs.yml b/.github/workflows/autodocs.yml
@@ -0,0 +1,17 @@
+name: Autodocs
+on:
+  push:
+    branches:
+      - "devel"
+
+jobs:
+  build:
+    name: Autodocumentation
+    runs-on: ubuntu-20.04
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2.0.0
+      with:
+        fetch-depth: 5
+    - uses: ./.github/actions/
+      id: github-autodocs
diff --git a/Autocoders/MagicDrawCompPlugin/test/DuckAppAi.xml b/Autocoders/MagicDrawCompPlugin/test/DuckAppAi.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?oxygen RNGSchema="file:../xml/ISF_Component_Schema.rnc" type="compact"?>
 <assembly namespace="Duck" >
     <comment Instantiate the Huey and Duey components/>
     <instance name ="Huey" type ="Duck"/>

diff --git a/Autocoders/Python/schema/sample_XML_files/channel/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/channel/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/channel_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <telemetry telemetry_base="x1">
     <channel id="0x0" name="ChanOne" update="always" data_type="I8" high_orange="30">
         <comment>Channel One</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/channel/colorString.xml b/Autocoders/Python/schema/sample_XML_files/channel/colorString.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/channel_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <telemetry telemetry_base="x1">
     <channel id="0x0" name="ChanOne" update="always" data_type="I8" high_orange="med">
         <comment>Channel One</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/channel/missingComments.xml b/Autocoders/Python/schema/sample_XML_files/channel/missingComments.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/channel_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <telemetry telemetry_base="x1">
     <channel id="0x0" name="ChanOne" update="always" data_type="I8" high_orange="30">
     </channel>

diff --git a/Autocoders/Python/schema/sample_XML_files/channel/missingDataType.xml b/Autocoders/Python/schema/sample_XML_files/channel/missingDataType.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/channel_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <telemetry telemetry_base="x1">
     <channel id="0x0" name="ChanOne" update="always" high_orange="30">
         <comment>Channel One</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/channel/missingEnum.xml b/Autocoders/Python/schema/sample_XML_files/channel/missingEnum.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/channel_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <telemetry telemetry_base="x1">
     <channel id="0x0" name="ChanOne" update="always" data_type="I8" high_orange="30">
         <comment>Channel One</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/command/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/command/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/command_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <commands opcode_base="$OPCODEBASE">
     <command kind="async" opcode="0" mnemonic="Flight Command Zero">
         <comment>Flight Command Zero executes very simple command.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/command/kindMixed.xml b/Autocoders/Python/schema/sample_XML_files/command/kindMixed.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/command_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <commands opcode_base="$OPCODEBASE">
     <command kind="async" opcode="0" mnemonic="Flight Command Zero" size = "10">
         <comment>Flight Command Zero executes very simple command.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/command/missingEnum.xml b/Autocoders/Python/schema/sample_XML_files/command/missingEnum.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/command_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <commands opcode_base="$OPCODEBASE">
     <command kind="async" opcode="0" mnemonic="Flight Command Zero" size = "10">
         <comment>Flight Command Zero executes very simple command.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/command/negativeCommandSize.xml b/Autocoders/Python/schema/sample_XML_files/command/negativeCommandSize.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/command_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <commands opcode_base="$OPCODEBASE">
     <command kind="async" opcode="0" mnemonic="Flight Command Zero" size = "-10">
         <comment>Flight Command Zero executes very simple command.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/command/noStringSize.xml b/Autocoders/Python/schema/sample_XML_files/command/noStringSize.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/command_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <commands opcode_base="$OPCODEBASE">
     <command kind="async" opcode="0" mnemonic="Flight Command Zero" size = "10">
         <comment>Flight Command Zero executes very simple command.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/component/baseAllWorking.xml b/Autocoders/Python/schema/sample_XML_files/component/baseAllWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <component name = "test" kind="active" namespace="SRC">
     <import_dictionary>test/one</import_dictionary>
     <import_port_type>test/two</import_port_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/component/complexAllWorking.xml b/Autocoders/Python/schema/sample_XML_files/component/complexAllWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <component name = "test" kind="active" namespace="SRC">
     <import_dictionary>test/one</import_dictionary>
     <import_port_type>test/two</import_port_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/component/interfaceOnly.xml b/Autocoders/Python/schema/sample_XML_files/component/interfaceOnly.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <component name = "test" kind="active" namespace="SRC">
     <import_dictionary>test/one</import_dictionary>
     <import_port_type>test/two</import_port_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/component/noPorts.xml b/Autocoders/Python/schema/sample_XML_files/component/noPorts.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <component name = "test" kind="active" namespace="SRC">
     <import_dictionary>test/one</import_dictionary>
     <import_port_type>test/two</import_port_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/event/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/event/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/event_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <events event_base="0x10">
     <event name="EventOne" id="0" severity="COMMAND" format_string="Event Status: s%" throttle="10">
         <comment>Informs event status.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/event/missingFormatString.xml b/Autocoders/Python/schema/sample_XML_files/event/missingFormatString.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/event_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <events event_base="0x10">
     <event name="EventOne" id="0" severity="INFO" format_string="Event Status: s%" throttle="10">
         <comment>Informs event status.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/event/negativeThrottle.xml b/Autocoders/Python/schema/sample_XML_files/event/negativeThrottle.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/event_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <events event_base="0x10">
     <event name="EventOne" id="0" severity="INFO" format_string="Event Status: s%" throttle="-10">
         <comment>Informs event status.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/event/unknownSeverity.xml b/Autocoders/Python/schema/sample_XML_files/event/unknownSeverity.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/event_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <events event_base="0x10">
     <event name="EventOne" id="0" severity="INFO" format_string="Event Status: s%" throttle="10">
         <comment>Informs event status.</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/interface/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/interface/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/interface_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <interface name="TEST" namespace="SRC" priority="1">
     <include_header>test/file/one</include_header>
     <comment>Interface Testing</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/interface/multipleReturns.xml b/Autocoders/Python/schema/sample_XML_files/interface/multipleReturns.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/interface_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <interface name="TEST" namespace="SRC" priority="1">
     <include_header>test/file/one</include_header>
     <comment>Interface Testing</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/interface/noEnumInReturn.xml b/Autocoders/Python/schema/sample_XML_files/interface/noEnumInReturn.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/interface_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <interface name="TEST" namespace="SRC" priority="1">
     <include_header>test/file/one</include_header>
     <comment>Interface Testing</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/interface/noReturns.xml b/Autocoders/Python/schema/sample_XML_files/interface/noReturns.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/interface_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <interface name="TEST" namespace="SRC" priority="1">
     <include_header>test/file/one</include_header>
     <comment>Interface Testing</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/interface/stringPriority.xml b/Autocoders/Python/schema/sample_XML_files/interface/stringPriority.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/interface_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <interface name="TEST" namespace="SRC" priority="high">
     <include_header>test/file/one</include_header>
     <comment>Interface Testing</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/parameter/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="32.1">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/floatInInt.xml b/Autocoders/Python/schema/sample_XML_files/parameter/floatInInt.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="32.1">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/negativeInUnsigned.xml b/Autocoders/Python/schema/sample_XML_files/parameter/negativeInUnsigned.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="32.1">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/noDefault.xml b/Autocoders/Python/schema/sample_XML_files/parameter/noDefault.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="32.1">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/noStringSize.xml b/Autocoders/Python/schema/sample_XML_files/parameter/noStringSize.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="32.1">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/parameter/stringInFloat.xml b/Autocoders/Python/schema/sample_XML_files/parameter/stringInFloat.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/parameters_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <parameters opcode_base="$testBase" parameter_base="0x10">
     <parameter id="0" set_opcode="0x1" save_opcode="0x2" name="ParamA" data_type="F32" default="tenPointThree">
         <comment>Float Parameter</comment>

diff --git a/Autocoders/Python/schema/sample_XML_files/serializable/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/serializable/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/serializable_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <serializable name = "Test" namespace="SRC">
     <comment>Serializable objects</comment>
     <import_serializable_type>test/path/one</import_serializable_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/serializable/multipleMembers.xml b/Autocoders/Python/schema/sample_XML_files/serializable/multipleMembers.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/serializable_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <serializable name = "Test" namespace="SRC">
     <comment>Serializable objects</comment>
     <import_serializable_type>test/path/one</import_serializable_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/serializable/noMembers.xml b/Autocoders/Python/schema/sample_XML_files/serializable/noMembers.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/serializable_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <serializable name = "Test" namespace="SRC">
     <comment>Serializable objects</comment>
     <import_serializable_type>test/path/one</import_serializable_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/serializable/noName.xml b/Autocoders/Python/schema/sample_XML_files/serializable/noName.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/serializable_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <serializable namespace="SRC">
     <comment>Serializable objects</comment>
     <import_serializable_type>test/path/one</import_serializable_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/serializable/noType.xml b/Autocoders/Python/schema/sample_XML_files/serializable/noType.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/serializable_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <serializable name = "Test" namespace="SRC">
     <comment>Serializable objects</comment>
     <import_serializable_type>test/path/one</import_serializable_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/allWorking.xml b/Autocoders/Python/schema/sample_XML_files/topology/allWorking.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF">
     <import_component_type>test/import/one</import_component_type>
     <import_component_type>test/import/two</import_component_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/negativeConnectionNumber.xml b/Autocoders/Python/schema/sample_XML_files/topology/negativeConnectionNumber.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF" base_id="0x10">
     <import_component_type>test/import/one</import_component_type>
     <import_component_type>test/import/two</import_component_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/noConnections.xml b/Autocoders/Python/schema/sample_XML_files/topology/noConnections.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF">
     <import_component_type>test/import/one</import_component_type>
     <import_component_type>test/import/two</import_component_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/noImports.xml b/Autocoders/Python/schema/sample_XML_files/topology/noImports.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF">
     <instance name="FlightModuleOne" namespace="SRC" type="FlightModule" dict_short_name = "FM1"/>
     <instance name="FlightModuleTwo" namespace="SRC" type="FlightModule" dict_short_name="FM2" base_id = "10"/>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/noInstances.xml b/Autocoders/Python/schema/sample_XML_files/topology/noInstances.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF">
     <import_component_type>test/import/one</import_component_type>
     <import_component_type>test/import/two</import_component_type>

diff --git a/Autocoders/Python/schema/sample_XML_files/topology/noTypes.xml b/Autocoders/Python/schema/sample_XML_files/topology/noTypes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../ISF/topology_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <assembly name = "REF" base_id="0x10">
     <import_component_type>test/import/one</import_component_type>
     <import_component_type>test/import/two</import_component_type>