fix: DevOps fixes onto main (#334)

* Implemented trestle assemble with some UT

* Modified docs

* Code format

* Code lint

* Extending UT

* Full UT

* assemble bug fix

* fix 'make docs-serve' on linux (Red Hat 7.9)

Signed-off-by: Lou Degenaro <degenaro@us.ibm.com>

* Updated to deal with inherently plural model names.

Signed-off-by: Chris Butler <chris@thebutlers.me>

* fix: Fix merge main to back to develop automatically.(#332)

* Corrected errors in the build process.

Signed-off-by: Chris Butler <chris@thebutlers.me>

* Corrected errors in the build process.

Signed-off-by: Chris Butler <chris@thebutlers.me>

Co-authored-by: Nebula Alam <anebula@au1.ibm.com>
Co-authored-by: degenaro <degenaro@us.ibm.com>

.github/workflows/python-push.yml

@@ -104,16 +104,16 @@ jobs:
       run: |
         mkdocs gh-deploy
 
-  merge-master-to-develop:
-    name: Merge master -> develop
+  merge-main-to-develop:
+    name: Merge main -> develop
     runs-on: ubuntu-latest
     needs: deploy
     if: github.ref == 'refs/heads/main'
     steps:
     - uses: tukasz/direct-merge-action@master
       with:
         GITHUB_TOKEN: ${{ secrets.ADMIN_PAT }}
-        source-branch: master
+        source-branch: main
         target-branch: develop
         commit-message: "chore: Merge back version tags and changelog into develop."
 

Makefile

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 develop:
 	python -m pip install -e .[dev] --upgrade --upgrade-strategy eager
 
@@ -37,6 +36,7 @@ code-typing:
 
 test::
 	python -m pytest --cov trestle tests --cov-report=xml --exitfirst --random-order
+
 test-verbose:
 	python -m pytest --cov trestle tests -v --cov-report=term-missing --cov-report=html:cov_html --exitfirst
 
@@ -55,5 +55,6 @@ docs-validate::
 	mkdocs build -c -s
 	rm -rf site
 
+
 docs-serve: docs-automation
 	mkdocs serve