Skip to content

Commit d24f9da

Browse files
committed
resolve issues in docs
1 parent 500619c commit d24f9da

File tree

4 files changed

+23
-50
lines changed

4 files changed

+23
-50
lines changed

.github/workflows/github-actions.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -92,35 +92,3 @@ jobs:
9292
python -m coreferee install en
9393
python -m nltk.downloader all
9494
95-
96-
97-
98-
# Test-DACKAR-Windows:
99-
# runs-on: windows-latest
100-
# steps:
101-
# - uses: conda-incubator/setup-miniconda@v3
102-
# with:
103-
# miniconda-version: "latest"
104-
# channels: conda-forge, defaults
105-
# use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
106-
# activate-environment: dackar_libs
107-
# auto-update-conda: true
108-
# auto-activate-base: false
109-
# - run: echo " The job was automatically triggered by a ${{ github.event_name }} event."
110-
# - run: echo " This job is now running on a ${{ runner.os }} server"
111-
# - run: echo " The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
112-
# - name: Check out repository code
113-
# uses: actions/checkout@v3
114-
# - run: pwd
115-
# - run: |
116-
# echo " Create dackar_libs"
117-
# conda create -n dackar_libs python=3.11
118-
# echo " Conda information"
119-
# conda info
120-
# echo " Activate Dackar conda environment"
121-
# conda init powershell
122-
# $CONDA/bin/activate dackar_libs
123-
# pip install spacy==3.5 textacy matplotlib nltk coreferee beautifulsoup4 networkx pysbd tomli numerizer autocorrect pywsd openpyxl quantulum3[classifier] numpy==1.26 scikit-learn pyspellchecker contextualSpellCheck pandas
124-
# python3 -m spacy download en_core_web_lg
125-
# python3 -m coreferee install en
126-
# python3 -m nltk.downloader all

.github/workflows/sphinx.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
channels: conda-forge, defaults
1616
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
1717
auto-update-conda: true
18-
auto-activate-base: true
19-
- run: conda install -c conda-forge pandoc
18+
activate-environment: dackar_libs
19+
auto-activate-base: false
20+
- run: conda install -c conda-forge pandoc python=3.11
2021
- name: Build HTML
2122
uses: ammaraskar/sphinx-action@master
2223
- name: Upload artifacts

docs/conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,20 @@
2929
# -- General configuration ---------------------------------------------------
3030
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
3131

32-
extensions = ['sphinx.ext.intersphinx',
33-
'sphinx.ext.autodoc',
32+
extensions = [
33+
"sphinx.ext.napoleon", # <- For Google style docstrings
34+
'sphinx.ext.intersphinx',
3435
'sphinx.ext.doctest',
3536
'sphinx.ext.todo',
3637
"sphinx.ext.autodoc.typehints",
3738
"sphinx.ext.mathjax",
3839
"sphinx.ext.autosummary",
3940
"nbsphinx", # <- For Jupyter Notebook support
40-
"sphinx.ext.napoleon", # <- For Google style docstrings
4141
"sphinx.ext.imgmath",
4242
"sphinx.ext.viewcode",
4343
'autoapi.extension',
4444
'sphinx_copybutton',
45+
'sphinx.ext.autodoc',
4546
]
4647

4748
templates_path = ['_templates']

src/dackar/utils/mbse/LMLparser.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ def LMLparser(self, diagramName):
4141
"""
4242
This method is designed to parse the xml file containing the MBSE model, to create its corresponding graph
4343
and to populate:
44-
- the set of entities: dictionary of assets in the form of 'LML_ID': ('asset name', 'asset ID')
45-
- the set of links: list containing the LML-IDs of all links between assets
46-
- the set of embedded entities: dictionary of the components that have been specified in the description text of the
47-
LML asset or link (e.g., [comp1,comp2,comp3]) in the form of 'LML_ID': [comp1,comp2,comp3]
44+
45+
* the set of entities: dictionary of assets in the form of 'LML_ID': ('asset name', 'asset ID')
46+
47+
* the set of links: list containing the LML-IDs of all links between assets
48+
49+
* the set of embedded entities: dictionary of the components that have been specified in the description text of the
50+
LML asset or link (e.g., [comp1,comp2,comp3]) in the form of 'LML_ID': [comp1,comp2,comp3]
4851
4952
Args:
5053
@@ -99,8 +102,8 @@ def parseLinkEntity(self, linkNode):
99102
100103
Args:
101104
102-
linkNode: xml node, xml node containing containing all the information of a single link generated
103-
in LML using Innoslate
105+
linkNode: xml node, xml node containing containing all the information of a single link generated
106+
in LML using Innoslate
104107
105108
Returns:
106109
@@ -130,8 +133,8 @@ def parseAssetEntity(self, entityNode):
130133
131134
Args:
132135
133-
linkNode: xml node, xml node containing containing all the information of a single link generated
134-
in LML using Innoslate
136+
linkNode: xml node, xml node containing containing all the information of a single link generated
137+
in LML using Innoslate
135138
136139
Returns:
137140
@@ -202,8 +205,8 @@ def returnEntities(self):
202205
203206
Returns:
204207
205-
self.entities : dict, dict of entities
206-
self.embEntities : dict, dict of embedded entities
208+
self.entities : dict, dict of entities
209+
self.embEntities : dict, dict of embedded entities
207210
"""
208211
return self.entities, self.embEntities
209212

@@ -323,9 +326,9 @@ def parseEntityDescription(text):
323326
324327
Returns:
325328
326-
out : tuple, tuple containing the list of elements specified in square brackets and separated
327-
by commas (e.g., ['FV304,'305']) and the link to an external MBSE model
328-
(e.g., ('centrifugalPumpFull', 'body'))
329+
out: tuple, tuple containing the list of elements specified in square brackets and separated
330+
by commas (e.g., ['FV304,'305']) and the link to an external MBSE model
331+
(e.g., ('centrifugalPumpFull', 'body'))
329332
330333
"""
331334

0 commit comments

Comments
 (0)