Skip to content
Snippets Groups Projects
Commit 9e15a145 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Restructuring of scripts and tools

parent f0357e37
Branches
No related tags found
No related merge requests found
Pipeline #2249 failed
Showing
with 102 additions and 14 deletions
...@@ -14,30 +14,57 @@ stages: ...@@ -14,30 +14,57 @@ stages:
- build - build
- upgrade - upgrade
Build pythonForPandocFilter docker image: Build generateCR docker image:
stage: build stage: build
before_script: cd generateChangemarks script: docker build --tag forge.etsi.org:5050/cti/tools/generatecr:$CI_COMMIT_BRANCH -f generateCR/dockerfile .
script: docker build --tag generatechangemarks:$CI_COMMIT_BRANCH -f dockerfile .
rules: rules:
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts" - if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
changes: changes:
- generateChangemarks/dockerfile - generateCR/dockerfile
- generateChangemarks/setup.py - generateCR/setup.py
- generateChangemarks/requirements.txt - generateCR/requirements.txt
- generateChangemarks/pandocFilter.py - generateCR/changemarks.py
- generateChangemarks/changemarks.py - generateCR/addTrackedChanges.py
- generateChangemarks/addTrackedChanges.py - generateChangemarks/checking_conflicts.sh
- generateChangemarks/generateTOC.py
- generateChangemarks/svg2png.py Build generateBaseline docker image:
stage: build
script: docker build --tag forge.etsi.org:5050/cti/tools/generatebaseline:$CI_COMMIT_BRANCH -f generateBaseline/dockerfile .
rules:
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
changes:
- generateBaseline/dockerfile
- generateBaseline/setup.py
- generateBaseline/requirements.txt
- generateBaseline/pandocFilter.py
- generateBaseline/generateTOC.py
- generateBaseline/svg2png.py
Build generateSpecWebSite docker image:
stage: build
script: docker build --tag forge.etsi.org:5050/cti/tools/generatespecwebsite:$CI_COMMIT_BRANCH -f generateSpecWebSite/dockerfile .
rules:
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
changes:
- generateSpecWebSite/dockerfile
- generateSpecWebSite/setup.py
- generateSpecWebSite/requirements.txt
- generateSpecWebSite/gridTableFilter.py
- generateSpecWebSite/gridTableTools.py
- generateSpecWebSite/indexDownload.md
- generateSpecWebSite/markdownTools.py
- generateSpecWebSite/regexMatches.py
- generateSpecWebSite/spec_on_pages.sh
- generateSpecWebSite/toMkdocs.py
Build Pandoc docker image: Build Pandoc docker image:
stage: build stage: build
before_script: cd generateChangemarks before_script: cd generateBaseline
script: docker build --tag pandoc:$CI_COMMIT_BRANCH -f dockerfile.pandoc . script: docker build --tag pandoc:$CI_COMMIT_BRANCH -f dockerfile.pandoc .
rules: rules:
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts" - if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
changes: changes:
- generateChangemarks/dockerfile.pandoc - generateBaseline/dockerfile.pandoc
Upgrade index for pages: Upgrade index for pages:
stage: upgrade stage: upgrade
......
FROM python:3.9-slim-bullseye FROM python:3.9-slim-bullseye
ADD . /generateChangemarks/ ADD /generateChangemarks/ /generateChangemarks/
RUN chmod +x generateChangemarks/checking_conflicts.sh
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get install -y libcairo2 && \ apt-get install -y libcairo2 && \
rm -rf /var/lib/apt/lists/* &&\ rm -rf /var/lib/apt/lists/* &&\
......
File moved
File moved
File moved
File moved
File moved
FROM python:3.9-slim-bullseye
ADD /generateCR/ /generateCR/
RUN chmod +x generateCR/checking_conflicts.sh
RUN apt-get update -y && \
# apt-get install -y libcairo2 && \
rm -rf /var/lib/apt/lists/* &&\
pip install -e generateCR/ &&\
pip install -r generateCR/requirements.txt
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile
#
lxml==4.9.3
# via oneM2M-markdown-to-pandoc-filter (setup.py)
markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
pygments==2.15.1
# via rich
rich==13.4.2
# via oneM2M-markdown-to-pandoc-filter (setup.py)
requests==2.31.0
unidiff==0.7.5
cairosvg==2.7.1
\ No newline at end of file
from setuptools import setup, find_packages
setup(
name='oneM2M markdown to pandoc filter',
version='0.0.1',
author='Andreas Kraft, Miguel Angel Reina Ortega',
author_email='an.kraft@gmail.com , miguelangel.reinaortega@etsi.org',
description='Convert oneM2M Markdown to Pandoc input',
packages=find_packages(),
install_requires=[
'rich',
'lxml',
],
entry_points= {
'console_scripts' : ['pandocFilter=pandocFilter:main',
'changemarks=changemarks:main',
'addTrackedChanges=addTrackedChanges:main',
'generateTOC=generateTOC:main',
'svg2png=svg2png:main',
]
}
)
FROM python:3.9-slim-bullseye
ADD /generateChangemarks/ /generateChangemarks/
RUN chmod +x generateChangemarks/checking_conflicts.sh
RUN apt-get update -y && \
apt-get install -y libcairo2 && \
rm -rf /var/lib/apt/lists/* &&\
pip install -e generateChangemarks/ &&\
pip install -r generateChangemarks/requirements.txt
File moved
generateSpecWebSite/images/Epub-old.png

4.54 KiB

File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment