Commit e221cefd authored by Nicolas Docquier's avatar Nicolas Docquier

Merge branch 'doc' into 'dev'

python doc

See merge request robotran/mbsysc!332
parents 1bc4677d dfb740ca
......@@ -38,7 +38,7 @@ MBsysC_realtimeON:
name: "Build_${CI_COMMIT_REF_NAME}"
InterfacePython :
image: immc/robotran-cross:v1.5
image: immc/robotran-cross:v1.11
stage: build
before_script:
# Add ssh key
......@@ -57,8 +57,8 @@ InterfacePython :
- mkdir python/MBsysPy/libs64/darwin python/MBsysPy/libs64/windows
- mkdir python/mbs_tgc/libs64/darwin python/mbs_tgc/libs64/windows
- cd ../mbs_interface/MBsysPy/doc
# - sphinx-apidoc -o source/ ../../ -f -e
#- make html
- sphinx-apidoc -o source/ ../../ -f -e
- make html
- cd ../../../..
- mkdir MBsysC/build-mingw
- cd MBsysC/build-mingw
......@@ -92,7 +92,7 @@ InterfacePython :
artifacts:
paths:
- MBsysC/build/python/dist/*
#- MBsysC/mbs_interface/MBsysPy/doc/_build/html/*
- MBsysC/mbs_interface/MBsysPy/doc/_build/html/
expire_in: 2d
name: "robotran-python-${CI_COMMIT_REF_NAME}"
......@@ -674,18 +674,19 @@ issue_170_User_Model:
# --------------------------------------------------------------------------
pages:
image: alpine
image: immc/robotran-cross:v1.11
stage: deploy
# dependencies:
# - InterfacePython
dependencies:
- InterfacePython
script:
- apk update && apk add doxygen
- cd ./MBsysC/mbs_documentation/src
- doxygen Doxyfile
- cd ../../..
- mv ./MBsysC/mbs_documentation/html/ public/
#- mkdir public/MBsysPy
#- cp ./MBsysC/mbs_interface/MBsysPy/MBsysPy/doc/_build/html/ public/MBsysPy
- mkdir public
- mv ./MBsysC/mbs_documentation/html/ public/MBsysC
- cp -r ./MBsysC/mbs_interface/MBsysPy/doc/_build/html/ public/MBsysPy
- echo '<!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> <title>title</title> </head> <body> <a href="MBsysC"</a> MBsysC<br> <a href="MBsysPy"> MBsysPy</a><br> </body> </html>' > public/index.html
artifacts:
paths:
- public
......
......@@ -2,6 +2,7 @@
import setuptools
import os
import sys
import pathlib
# Retrieve version number
if os.path.isfile(os.path.join('MBsysPy', 'MBsysPyVersion.py')):
......@@ -10,7 +11,7 @@ if os.path.isfile(os.path.join('MBsysPy', 'MBsysPyVersion.py')):
else:
version = "9.dev"
with open("Readme_MBsysPy.md", "r") as fh:
with open(pathlib.Path(__file__).parent.parent.absolute().joinpath("Readme_MBsysPy.md"), "r") as fh:
long_description = fh.read()
setuptools.setup(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment