Skip to content
Snippets Groups Projects
Verified Commit ca22800e authored by Yoann Schneider's avatar Yoann Schneider :tennis:
Browse files

Bump base-worker

parent 387d1092
No related branches found
No related tags found
1 merge request!3Bump Python requirement arkindex-base-worker to 0.4.0
Pipeline #203144 passed
...@@ -6,7 +6,7 @@ workers: ...@@ -6,7 +6,7 @@ workers:
name: Thumbnails Generator name: Thumbnails Generator
type: Utils type: Utils
docker: docker:
build: Dockerfile command: worker-thumbnails-generator
configuration: configuration:
width: 900 width: 900
height: 400 height: 400
......
...@@ -14,7 +14,7 @@ variables: ...@@ -14,7 +14,7 @@ variables:
DEBIAN_FRONTEND: non-interactive DEBIAN_FRONTEND: non-interactive
test: test:
image: python:slim image: python:3.12-slim
stage: test stage: test
cache: cache:
...@@ -41,7 +41,7 @@ test: ...@@ -41,7 +41,7 @@ test:
- tox -- --junitxml=test-report.xml --durations=50 - tox -- --junitxml=test-report.xml --durations=50
lint: lint:
image: python:slim image: python:3.12-slim
cache: cache:
paths: paths:
......
repos: repos:
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version. # Ruff version.
rev: v0.3.1 rev: v0.8.2
hooks: hooks:
# Run the linter. # Run the linter.
- id: ruff - id: ruff
...@@ -9,7 +9,7 @@ repos: ...@@ -9,7 +9,7 @@ repos:
# Run the formatter. # Run the formatter.
- id: ruff-format - id: ruff-format
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0 rev: v5.0.0
hooks: hooks:
- id: check-ast - id: check-ast
- id: check-docstring-first - id: check-docstring-first
...@@ -27,10 +27,16 @@ repos: ...@@ -27,10 +27,16 @@ repos:
- id: check-toml - id: check-toml
- id: requirements-txt-fixer - id: requirements-txt-fixer
- repo: https://github.com/codespell-project/codespell - repo: https://github.com/codespell-project/codespell
rev: v2.2.6 rev: v2.3.0
hooks: hooks:
- id: codespell - id: codespell
args: ['--write-changes'] args: ['--write-changes']
- repo: meta - repo: meta
hooks: hooks:
- id: check-useless-excludes - id: check-useless-excludes
- repo: https://gitlab.teklia.com/tools/pre-commit-hooks
rev: 0.1.0
hooks:
- id: long-test-files
args: ['1000']
files: '^tests\/(.*\/)?test_[^\/]*\.py$'
\ No newline at end of file
...@@ -11,8 +11,4 @@ COPY worker_thumbnails_generator worker_thumbnails_generator ...@@ -11,8 +11,4 @@ COPY worker_thumbnails_generator worker_thumbnails_generator
COPY requirements.txt setup.py pyproject.toml ./ COPY requirements.txt setup.py pyproject.toml ./
RUN pip install . --no-cache-dir RUN pip install . --no-cache-dir
# Add archi local CA
RUN curl https://assets.teklia.com/teklia_dev_ca.pem > /usr/local/share/ca-certificates/arkindex-dev.crt && update-ca-certificates
ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
CMD ["worker-thumbnails-generator"] CMD ["worker-thumbnails-generator"]
...@@ -45,7 +45,7 @@ def _setup_environment(responses, monkeypatch) -> None: ...@@ -45,7 +45,7 @@ def _setup_environment(responses, monkeypatch) -> None:
monkeypatch.setattr(BaseWorker, "setup_api_client", mock_setup_api_client) monkeypatch.setattr(BaseWorker, "setup_api_client", mock_setup_api_client)
@pytest.fixture() @pytest.fixture
def mock_worker() -> ThumbnailsGenerator: def mock_worker() -> ThumbnailsGenerator:
worker = ThumbnailsGenerator() worker = ThumbnailsGenerator()
worker.args = Namespace(dev=False) worker.args = Namespace(dev=False)
...@@ -63,7 +63,7 @@ def mock_worker() -> ThumbnailsGenerator: ...@@ -63,7 +63,7 @@ def mock_worker() -> ThumbnailsGenerator:
return worker return worker
@pytest.fixture() @pytest.fixture
def page_1_payload() -> dict: def page_1_payload() -> dict:
return { return {
"id": "page_1", "id": "page_1",
...@@ -89,7 +89,7 @@ def page_1_payload() -> dict: ...@@ -89,7 +89,7 @@ def page_1_payload() -> dict:
} }
@pytest.fixture() @pytest.fixture
def page_2_payload() -> dict: def page_2_payload() -> dict:
return { return {
"id": "page_2", "id": "page_2",
...@@ -115,7 +115,7 @@ def page_2_payload() -> dict: ...@@ -115,7 +115,7 @@ def page_2_payload() -> dict:
} }
@pytest.fixture() @pytest.fixture
def page_3_payload() -> dict: def page_3_payload() -> dict:
return { return {
"id": "page_3", "id": "page_3",
...@@ -141,7 +141,7 @@ def page_3_payload() -> dict: ...@@ -141,7 +141,7 @@ def page_3_payload() -> dict:
} }
@pytest.fixture() @pytest.fixture
def pages_payload( def pages_payload(
page_1_payload: dict, page_2_payload: dict, page_3_payload: dict page_1_payload: dict, page_2_payload: dict, page_3_payload: dict
) -> list[dict]: ) -> list[dict]:
......
...@@ -14,18 +14,11 @@ class ThumbnailsGenerator(ElementsWorker): ...@@ -14,18 +14,11 @@ class ThumbnailsGenerator(ElementsWorker):
def configure(self) -> None: def configure(self) -> None:
super().configure() super().configure()
if self.user_configuration:
logger.info("Loading user_configuration")
self.config.update(self.user_configuration)
self.thumbnail_width: int = self.config["width"] self.thumbnail_width: int = self.config["width"]
self.thumbnail_height: int = self.config["height"] self.thumbnail_height: int = self.config["height"]
self.first_n: int = self.config.get("first_n") self.first_n: int = self.config.get("first_n")
corpus = self.request("RetrieveCorpus", id=self.corpus_id) self.list_corpus_types()
self.corpus_types = {
element_type["slug"]: element_type for element_type in corpus["types"]
}
def _list_folder_elements(self, folder): def _list_folder_elements(self, folder):
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment