From a4a8da6043b77236aa7e1928414a0eeea7a8a865 Mon Sep 17 00:00:00 2001 From: GromeTT Date: Tue, 5 Jul 2022 21:11:42 +0200 Subject: [PATCH 1/5] chore: Remove version restriction for sphinx --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8ddc8d9..25ed127 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ #https://git.rwth-aachen.de/kwh40/fml40-reference-implementation/-/jobs/artifacts/master/raw/public/fml40_reference_implementation-0.2.3-py3-none-any.whl?job=wheel -Sphinx==3.3.0 +Sphinx sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3 @@ -7,4 +7,4 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.4 recommonmark==0.6.0 -fml40-reference-implementation \ No newline at end of file +fml40-reference-implementation -- GitLab From e19ab6514e6b48cb781290f546a368a001c28ee0 Mon Sep 17 00:00:00 2001 From: GromeTT Date: Tue, 5 Jul 2022 21:25:31 +0200 Subject: [PATCH 2/5] chore: Separate pipeline into build and deploy stage Building the wheel and the documentation will be executed in every branch. Execution of deployment is still restricted to master branch. This allows testing of the pipeline. --- .gitlab-ci.yml | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7193c6..98e29d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,30 @@ image: python:3.7 stages: - - build_wheel - - build_doc + - build + - deploy -wheel: +build_wheel: tags: - wheel - stage: build_wheel + stage: build + script: + - pip install --upgrade pip setuptools wheel + - python setup.py bdist_wheel + +build_docs: + tags: + - doc + stage: build + script: + - pip install -r requirements.txt + - cd docs + - make html + +deploy_wheel: + tags: + - wheel + stage: deploy script: - pip install --upgrade pip setuptools wheel - python setup.py bdist_wheel @@ -20,12 +37,12 @@ wheel: only: - master -pages: +deploy_pages: tags: - doc - stage: build_doc + stage: deploy dependencies: - - wheel + - deploy_wheel script: - pip install -r requirements.txt - cd docs @@ -36,4 +53,4 @@ pages: paths: - public only: - - master + - master \ No newline at end of file -- GitLab From ba0182f31e45f97c7c9d1415c906ff7f79ec5484 Mon Sep 17 00:00:00 2001 From: GromeTT Date: Tue, 5 Jul 2022 21:28:43 +0200 Subject: [PATCH 3/5] chore: Upgrade pip before every script execution --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98e29d8..94e5483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,12 +4,15 @@ stages: - build - deploy +before_script: + - pip install --upgrade pip + build_wheel: tags: - wheel stage: build script: - - pip install --upgrade pip setuptools wheel + - pip install --upgrade setuptools wheel - python setup.py bdist_wheel build_docs: @@ -26,7 +29,7 @@ deploy_wheel: - wheel stage: deploy script: - - pip install --upgrade pip setuptools wheel + - pip install --upgrade setuptools wheel - python setup.py bdist_wheel - mv dist/ public -- GitLab From 7a74cc8ebb911710a7ab145bf9fbc7a8d3d72644 Mon Sep 17 00:00:00 2001 From: GromeTT Date: Tue, 5 Jul 2022 21:42:30 +0200 Subject: [PATCH 4/5] Use sphinx 5.0.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 25ed127..f954521 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ #https://git.rwth-aachen.de/kwh40/fml40-reference-implementation/-/jobs/artifacts/master/raw/public/fml40_reference_implementation-0.2.3-py3-none-any.whl?job=wheel -Sphinx +Sphinx==5.0.2 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3 -- GitLab From 00be43a96217be35c50f65e30b7a896727208c9f Mon Sep 17 00:00:00 2001 From: Christian A Date: Tue, 5 Jul 2022 21:45:53 +0200 Subject: [PATCH 5/5] chore: Remove additional sphinx packages --- requirements.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index f954521..36a9509 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,4 @@ #https://git.rwth-aachen.de/kwh40/fml40-reference-implementation/-/jobs/artifacts/master/raw/public/fml40_reference_implementation-0.2.3-py3-none-any.whl?job=wheel Sphinx==5.0.2 -sphinxcontrib-applehelp==1.0.2 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==1.0.3 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.4 recommonmark==0.6.0 fml40-reference-implementation -- GitLab