From e75f792bc3c92ec602279a4ae7b3e2cd1b5ab5ac Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 14:41:55 +0100
Subject: [PATCH 01/24] Update ci
---
.gitlab-ci.yml | 159 ++++++++++---------------------------------------
1 file changed, 32 insertions(+), 127 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3f797b..5984d92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,133 +1,38 @@
-default:
- image: python:3.12-slim
-
-workflow:
- rules:
- - if: $CI_MERGE_REQUEST_ID
- - if: $CI_COMMIT_BRANCH == 'main'
-
-cache:
- paths:
- - .cache/pip
- - .venv
-
-before_script:
- - pip install virtualenv
- - virtualenv .venv
- - source .venv/bin/activate
- - pip install -e .
+include:
+ - project: "cdos-pub/pycode-quality"
+ ref: "main"
+ file:
+ - ".gitlab/ci/docker.yml"
+ - ".gitlab/ci/static-analysis.yml"
+ - ".gitlab/ci/doc.yml"
+ - ".gitlab/ci/pip.yml"
+
+variables:
+ IMPL_MODULE_NAME: theia_dumper
+
+ TWINE_USERNAME: __token__
+ TWINE_PASSWORD: $PYPI_TOKEN
+ PIP_PACKAGE_URL: https://upload.pypi.org/legacy/
stages:
- - Install
- Static Analysis
+ - Docker image
- Test
- - Ship
- - Documentation
-
-# ------------------------------- Install -------------------------------------
-
-pip_install:
- stage: Install
- before_script:
- - python --version ; pip --version
- script:
- - pip install .
- - pip list -v
-
-# ------------------------------ Static analysis ------------------------------
-
-.static_analysis_base:
- stage: Static Analysis
- allow_failure: true
-
-flake8:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install flake8
- - flake8 --ignore E501 ./theia_dumper
-
-pylint:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install pylint
- - pylint ./theia_dumper
-
-codespell:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install codespell
- - codespell ./theia_dumper docs README.md
-
-pydocstyle:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install pydocstyle
- - pydocstyle ./theia_dumper
-
-mypy:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install mypy
- - pip list -v
- - mypy --install-types --non-interactive .
-
-
-# --------------------------------- Doc ---------------------------------------
-
-.doc_base:
- stage: Documentation
- artifacts:
- paths:
- - public
- - public_test
-
-test:
- extends: .doc_base
- except:
- - main
- script:
- - pip install -r doc/doc_requirements.txt
- - mkdocs build --site-dir public_test
-
-pages:
- extends: .doc_base
- only:
- - main
- script:
- - pip install -r doc/doc_requirements.txt
- - mkdocs build --site-dir public
-
-# --------------------------------- Test --------------------------------------
-
-.tests_base:
+ - Pip
+
+.docker_base:
+ image: docker:latest
+ variables:
+ DOCKER_TLS_CERTDIR: ""
+ DOCKER_HOST: tcp://docker:2375
+ services:
+ - name: docker:dind
+ entrypoint: ["dockerd-entrypoint.sh", "--tls=false"]
+
+Test API:
stage: Test
- except:
- - main
-
-Tests:
- extends: .tests_base
- script:
- - python tests/all.py
-
-# --------------------------------- Ship --------------------------------------
-
-pypi:
- stage: Ship
- only:
- - main
- before_script:
- - python3 -m pip install --upgrade build twine
+ extends: .docker_base
+ except: [main]
script:
- - python3 -m build
- after_script:
- - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive --verbose -u __token__ -p $pypi_token dist/*
+ - docker compose build
+ - docker compose up --abort-on-container-exit --exit-code-from test
--
GitLab
From fb0238d6e076a68fda6c6fa4b8c4c6ebe1c2a8e8 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 14:42:21 +0100
Subject: [PATCH 02/24] Add doc stage
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5984d92..4e10693 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ stages:
- Static Analysis
- Docker image
- Test
+ - Documentation
- Pip
.docker_base:
--
GitLab
From 4deed885dca21157143b428ce174b5bf2c82ccdd Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 14:49:58 +0100
Subject: [PATCH 03/24] Set python img
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e10693..7f2d089 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,8 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
+ PYTHON_IMG: python:3.12-slim
+
TWINE_USERNAME: __token__
TWINE_PASSWORD: $PYPI_TOKEN
PIP_PACKAGE_URL: https://upload.pypi.org/legacy/
--
GitLab
From 7bf1a02979ef88a12f326688fdb9af278b087c2c Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:01:33 +0100
Subject: [PATCH 04/24] Fix ci and fix warnings
---
.gitlab-ci.yml | 9 ---------
doc/access.md | 2 +-
doc/gen_ref_pages.py | 6 +++---
pyproject.toml | 3 +++
tests/all.py | 25 +++++++++++++------------
5 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f2d089..856357c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,15 +23,6 @@ stages:
- Documentation
- Pip
-.docker_base:
- image: docker:latest
- variables:
- DOCKER_TLS_CERTDIR: ""
- DOCKER_HOST: tcp://docker:2375
- services:
- - name: docker:dind
- entrypoint: ["dockerd-entrypoint.sh", "--tls=false"]
-
Test API:
stage: Test
extends: .docker_base
diff --git a/doc/access.md b/doc/access.md
index 139249a..1c59655 100644
--- a/doc/access.md
+++ b/doc/access.md
@@ -42,5 +42,5 @@ used, e.g.:
...
```
-Note that collections IDs and buckets/paths prefixes are completely independant.
+Note that collections IDs and buckets/paths prefixes are completely independent.
diff --git a/doc/gen_ref_pages.py b/doc/gen_ref_pages.py
index 176c7e4..9421dbb 100755
--- a/doc/gen_ref_pages.py
+++ b/doc/gen_ref_pages.py
@@ -17,8 +17,8 @@ for path in sorted(Path("theia_dumper").rglob("*.py")): #
continue
with mkdocs_gen_files.open(full_doc_path, "w") as fd: #
- identifier = ".".join(parts) #
- print("::: " + identifier)
- print("::: " + identifier, file=fd) #
+ IDENTIFIER = ".".join(parts) #
+ print("::: " + IDENTIFIER)
+ print("::: " + IDENTIFIER, file=fd) #
mkdocs_gen_files.set_edit_path(full_doc_path, path)
diff --git a/pyproject.toml b/pyproject.toml
index 717d881..673c855 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,5 +44,8 @@ exclude = ["doc", "venv", ".venv"]
[tool.pylint]
disable = "W1203,R0903,E0401,W0622,C0116,C0115"
+[tool.pylint.MASTER]
+ignore-paths = '^.venv'
+
[tool.setuptools]
packages = ["theia_dumper"]
diff --git a/tests/all.py b/tests/all.py
index 9f43d3a..d6ba3cb 100755
--- a/tests/all.py
+++ b/tests/all.py
@@ -1,3 +1,4 @@
+"""Test file."""
#!/usr/bin/env python
import os
@@ -17,27 +18,27 @@ handler = stac.TransactionsHandler(
assets_overwrite=True,
)
-image_href = (
+IMAGE_HREF = (
"https://gitlab.orfeo-toolbox.org/orfeotoolbox/"
"otb/-/raw/develop/Data/Input/SP67_FR_subset_1.tif"
)
-col_id = "collection-for-theia-dumper-tests"
+COL_ID = "collection-for-theia-dumper-tests"
items_ids = ["item_1", "item_2"]
-raster_file1 = "/tmp/raster1.tif"
-raster_file2 = "/tmp/raster2.tif"
-with open(raster_file1, "wb") as f:
- r = requests.get(image_href, timeout=5)
+RASTER_FILE1 = "/tmp/raster1.tif"
+RASTER_FILE2 = "/tmp/raster2.tif"
+with open(RASTER_FILE1, "wb") as f:
+ r = requests.get(IMAGE_HREF, timeout=5)
f.write(r.content)
-shutil.copyfile(raster_file1, raster_file2)
+shutil.copyfile(RASTER_FILE1, RASTER_FILE2)
def clear():
"""Clear all test items and collection."""
for item_id in items_ids:
- handler.delete(col_id=col_id, item_id=item_id)
- handler.delete(col_id=col_id)
+ handler.delete(col_id=COL_ID, item_id=item_id)
+ handler.delete(col_id=COL_ID)
def create_item(item_id: str):
@@ -60,8 +61,8 @@ def create_item(item_id: str):
datetime=datetime.now().replace(year=1999),
properties={},
assets={
- "ndvi": pystac.Asset(href=raster_file1),
- "crswir": pystac.Asset(href=raster_file2),
+ "ndvi": pystac.Asset(href=RASTER_FILE1),
+ "crswir": pystac.Asset(href=RASTER_FILE2),
},
)
@@ -73,7 +74,7 @@ def create_collection():
spat_extent = pystac.SpatialExtent([[0, 0, 2, 3]])
temp_extent = pystac.TemporalExtent(intervals=[(None, None)])
col = pystac.Collection(
- id=col_id,
+ id=COL_ID,
extent=pystac.Extent(spat_extent, temp_extent),
description="Some description",
href="http://hello.fr/collections/collection-for-tests",
--
GitLab
From 4e755147f7a0b6ab566c524233b270828b539ea3 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:03:19 +0100
Subject: [PATCH 05/24] Fix test
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 856357c..1afe6dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,9 @@ stages:
Test API:
stage: Test
- extends: .docker_base
+ extends: .docker_build_base
except: [main]
- script:
+ before_script:
- docker compose build
+ script:
- docker compose up --abort-on-container-exit --exit-code-from test
--
GitLab
From 8914222dd251163c3d5146cbffc3510a641170e2 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:08:49 +0100
Subject: [PATCH 06/24] Fix build
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1afe6dd..860d2ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,6 @@ variables:
stages:
- Static Analysis
- - Docker image
- Test
- Documentation
- Pip
--
GitLab
From 446f68ef50648beb8bb018ff2201d377bb29860f Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:11:01 +0100
Subject: [PATCH 07/24] Fix test
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 860d2ff..bd0a2ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,10 +23,10 @@ stages:
- Pip
Test API:
+ extends: .static_analysis_with_pip_install
stage: Test
- extends: .docker_build_base
+ allow_failure: false
except: [main]
- before_script:
- - docker compose build
script:
+ - docker compose build
- docker compose up --abort-on-container-exit --exit-code-from test
--
GitLab
From 432b667ec8915cea0a64193ebc467df5ee37659a Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:11:16 +0100
Subject: [PATCH 08/24] Fix
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd0a2ba..9f0593b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ include:
- project: "cdos-pub/pycode-quality"
ref: "main"
file:
- - ".gitlab/ci/docker.yml"
- ".gitlab/ci/static-analysis.yml"
- ".gitlab/ci/doc.yml"
- ".gitlab/ci/pip.yml"
--
GitLab
From 6d2be7de13ac4cc5f8c95244b2406bf340d5acde Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 15:14:17 +0100
Subject: [PATCH 09/24] Fix test
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f0593b..4ac0f96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,5 +27,4 @@ Test API:
allow_failure: false
except: [main]
script:
- - docker compose build
- - docker compose up --abort-on-container-exit --exit-code-from test
+ - python tests/all.py
--
GitLab
From bc2141492689fbc8facaad1904f2bc54e3d3a40a Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 9 Jan 2025 17:29:24 +0100
Subject: [PATCH 10/24] Increase version
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 673c855..44ccfbc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "theia_dumper"
-version = "0.0.4"
+version = "0.0.5"
description = "THEIA-MTP geospatial data publisher"
authors = [{ name = "Rémi Cresson", email = "remi.cresson@inrae.fr" }]
requires-python = ">=3.9"
--
GitLab
From 9240f2bd154e9f1aa6b5de18e51d4438c05451c4 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Fri, 10 Jan 2025 16:42:10 +0100
Subject: [PATCH 11/24] Update readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1c17c93..18b4aeb 100644
--- a/README.md
+++ b/README.md
@@ -21,4 +21,4 @@ For more information read the [documentation](https://cdos-pub.pages.mia.inra.fr
## Contact
-remi cresson @ inrae
+remi cresson @ inrae.fr
--
GitLab
From c8826657d6e1fd45dc3b01112622248015a678e8 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 11:42:12 +0100
Subject: [PATCH 12/24] Add doc self build
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac0f96..3999bad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,8 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
+ DOC_BUILD_SELF: true
+
PYTHON_IMG: python:3.12-slim
TWINE_USERNAME: __token__
--
GitLab
From eaac19ae4cd6c3eae4b17ecaadd0aac0941fd732 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 11:42:55 +0100
Subject: [PATCH 13/24] Fix warn
---
tests/all.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/all.py b/tests/all.py
index d6ba3cb..f176ec5 100755
--- a/tests/all.py
+++ b/tests/all.py
@@ -1,5 +1,4 @@
"""Test file."""
-#!/usr/bin/env python
import os
import shutil
--
GitLab
From cf01b7c2c0bc44d820702672f4f4db72162825ef Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 11:58:18 +0100
Subject: [PATCH 14/24] Fix typo
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3999bad..04fd9db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
- DOC_BUILD_SELF: true
+ DOC_BUILD_SELF: "true"
PYTHON_IMG: python:3.12-slim
--
GitLab
From 63ebb12ff426cbe7f76d48a8b6839c80c245cc8c Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 12:06:15 +0100
Subject: [PATCH 15/24] Format file
---
theia_dumper/stac.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/theia_dumper/stac.py b/theia_dumper/stac.py
index c120e8f..b8614a9 100644
--- a/theia_dumper/stac.py
+++ b/theia_dumper/stac.py
@@ -234,8 +234,7 @@ class TransactionsHandler:
self.publish_item_collection(item_collection=obj)
else:
raise TypeError(
- "Invalid type, must be ItemCollection or Collection "
- f"(got {type(obj)})"
+ f"Invalid type, must be ItemCollection or Collection (got {type(obj)})"
)
def delete(self, col_id: str, item_id: str | None = None):
--
GitLab
From 315b6e3de385ee0dafce930c7d13f3e8cba558d5 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 14:05:14 +0100
Subject: [PATCH 16/24] Update debug
---
.gitlab-ci.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04fd9db..e36ecef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,12 @@ stages:
- Documentation
- Pip
+.doc_base:
+ before_script:
+ - echo $DOC_BUILD_SELF
+ - if [ "$DOC_BUILD_SELF" == "true" ]; then pip install -e .; fi # Used when documentation requires the package to be built (for api, cli doc)
+ - pip install -r doc/doc_requirements.txt
+
Test API:
extends: .static_analysis_with_pip_install
stage: Test
--
GitLab
From a65ec7a3125b9909bab33fd13f4c5e2d7200ab2f Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 14:05:27 +0100
Subject: [PATCH 17/24] Up
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e36ecef..3dc46e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
- DOC_BUILD_SELF: "true"
+ DOC_BUILD_SELF: "false"
PYTHON_IMG: python:3.12-slim
--
GitLab
From 6ef52b8847f8673df55d8f9f4ade6a69918f1a7c Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 14:46:55 +0100
Subject: [PATCH 18/24] Update var
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dc46e5..e36ecef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
- DOC_BUILD_SELF: "false"
+ DOC_BUILD_SELF: "true"
PYTHON_IMG: python:3.12-slim
--
GitLab
From da663018003c51f6dc2a85ae23dce01bd728e0c7 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 15:02:49 +0100
Subject: [PATCH 19/24] Up
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e36ecef..cc14a4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ include:
variables:
IMPL_MODULE_NAME: theia_dumper
- DOC_BUILD_SELF: "true"
+ DOC_BUILD_SELF: true
PYTHON_IMG: python:3.12-slim
@@ -18,15 +18,15 @@ variables:
PIP_PACKAGE_URL: https://upload.pypi.org/legacy/
stages:
+ - Documentation
- Static Analysis
- Test
- - Documentation
- Pip
.doc_base:
before_script:
- echo $DOC_BUILD_SELF
- - if [ "$DOC_BUILD_SELF" == "true" ]; then pip install -e .; fi # Used when documentation requires the package to be built (for api, cli doc)
+ - if [[ "$DOC_BUILD_SELF" == "true" ]]; then pip install -e .; fi # Used when documentation requires the package to be built (for api, cli doc)
- pip install -r doc/doc_requirements.txt
Test API:
--
GitLab
From 5d45a60f1bec3dde1c33a9390cbef83845d16142 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 15:12:09 +0100
Subject: [PATCH 20/24] Up
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc14a4b..2552f68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,10 @@ include:
- ".gitlab/ci/pip.yml"
variables:
- IMPL_MODULE_NAME: theia_dumper
-
DOC_BUILD_SELF: true
+ IMPL_MODULE_NAME: theia_dumper
+
PYTHON_IMG: python:3.12-slim
TWINE_USERNAME: __token__
--
GitLab
From 8db18d161dd204d56bb8a7fde1b7b55fc45e97bc Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 15:14:06 +0100
Subject: [PATCH 21/24] Up
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2552f68..e514b78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,6 @@ include:
- ".gitlab/ci/pip.yml"
variables:
- DOC_BUILD_SELF: true
-
IMPL_MODULE_NAME: theia_dumper
PYTHON_IMG: python:3.12-slim
@@ -24,6 +22,8 @@ stages:
- Pip
.doc_base:
+ variables:
+ DOC_BUILD_SELF: true
before_script:
- echo $DOC_BUILD_SELF
- if [[ "$DOC_BUILD_SELF" == "true" ]]; then pip install -e .; fi # Used when documentation requires the package to be built (for api, cli doc)
--
GitLab
From 7f363f02d57c7281235f9eeae16024a5cb276558 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 15:15:32 +0100
Subject: [PATCH 22/24] Change ci order
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e514b78..95351ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,9 +16,9 @@ variables:
PIP_PACKAGE_URL: https://upload.pypi.org/legacy/
stages:
- - Documentation
- Static Analysis
- Test
+ - Documentation
- Pip
.doc_base:
--
GitLab
From 5aecc5b2232a5b483172d0b91a35513a8ad9b60c Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 15:21:11 +0100
Subject: [PATCH 23/24] Remove unused line
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95351ef..68875e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,10 +24,6 @@ stages:
.doc_base:
variables:
DOC_BUILD_SELF: true
- before_script:
- - echo $DOC_BUILD_SELF
- - if [[ "$DOC_BUILD_SELF" == "true" ]]; then pip install -e .; fi # Used when documentation requires the package to be built (for api, cli doc)
- - pip install -r doc/doc_requirements.txt
Test API:
extends: .static_analysis_with_pip_install
--
GitLab
From b65c3523ad81b4342040531e620e5abc6b32fcd5 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Mon, 13 Jan 2025 16:23:17 +0100
Subject: [PATCH 24/24] Move doc build self
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68875e3..fbe0a46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,8 @@ variables:
PYTHON_IMG: python:3.12-slim
+ DOC_BUILD_SELF: true
+
TWINE_USERNAME: __token__
TWINE_PASSWORD: $PYPI_TOKEN
PIP_PACKAGE_URL: https://upload.pypi.org/legacy/
@@ -21,10 +23,6 @@ stages:
- Documentation
- Pip
-.doc_base:
- variables:
- DOC_BUILD_SELF: true
-
Test API:
extends: .static_analysis_with_pip_install
stage: Test
--
GitLab