From 5276c7e5834892bd0d451eb4b286946aa1118b69 Mon Sep 17 00:00:00 2001 From: yeraydavidrodriguez Date: Tue, 15 Feb 2022 14:24:53 +0000 Subject: [PATCH 1/5] Add installation instructions to publishing workflows --- .github/workflows/publish-docker-image.yml | 6 ++++++ .github/workflows/publish-github-release.yml | 6 ++++++ .github/workflows/publish-pypi-package.yml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index 9167ca4..79d50d1 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -21,6 +21,12 @@ jobs: with: python-version: "3.9" + - name: Setup Libvips + run: | + sudo apt-get update + sudo apt-get upgrade -y + sudo apt-get install -y libvips-dev + - name: Setup Poetry run: pip3 install poetry poetry-dynamic-versioning diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml index f74c2cb..0ac975c 100644 --- a/.github/workflows/publish-github-release.yml +++ b/.github/workflows/publish-github-release.yml @@ -20,6 +20,12 @@ jobs: with: python-version: "3.9" + - name: Setup Libvips + run: | + sudo apt-get update + sudo apt-get upgrade -y + sudo apt-get install -y libvips-dev + - name: Setup Poetry run: pip3 install poetry poetry-dynamic-versioning diff --git a/.github/workflows/publish-pypi-package.yml b/.github/workflows/publish-pypi-package.yml index bdd2e1d..81a9979 100644 --- a/.github/workflows/publish-pypi-package.yml +++ b/.github/workflows/publish-pypi-package.yml @@ -18,6 +18,12 @@ jobs: with: python-version: "3.9" + - name: Setup Libvips + run: | + sudo apt-get update + sudo apt-get upgrade -y + sudo apt-get install -y libvips-dev + - name: Setup Poetry run: pip3 install poetry poetry-dynamic-versioning From b395caa7c8b0b5f96a3d0d75fa8c64ae29b137e0 Mon Sep 17 00:00:00 2001 From: yeraydavidrodriguez Date: Tue, 15 Feb 2022 14:40:34 +0000 Subject: [PATCH 2/5] Fix isort linting errors --- .../typer/commands/workflows/actions/auto_commit_base_images.py | 2 +- .../commands/workflows/actions/delete_base_images_action.py | 2 +- .../commands/workflows/actions/generate_base_images_action.py | 2 +- .../commands/workflows/actions/rename_base_images_action.py | 2 +- .../typer/commands/workflows/gold_images_processing.py | 2 +- .../test_mods/test_dvc/test_domain/test_dvc_services_api.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nautilus_librarian/typer/commands/workflows/actions/auto_commit_base_images.py b/src/nautilus_librarian/typer/commands/workflows/actions/auto_commit_base_images.py index 03c0b91..d8d8375 100644 --- a/src/nautilus_librarian/typer/commands/workflows/actions/auto_commit_base_images.py +++ b/src/nautilus_librarian/typer/commands/workflows/actions/auto_commit_base_images.py @@ -1,11 +1,11 @@ import os from typing import List +from nautilus_librarian.domain.dvc_services_api import DvcServicesApi from nautilus_librarian.domain.file_locator import ( file_locator, guard_that_base_image_exists, ) -from nautilus_librarian.domain.dvc_services_api import DvcServicesApi from nautilus_librarian.mods.dvc.domain.utils import ( extract_added_files_from_dvc_diff, extract_deleted_files_from_dvc_diff, diff --git a/src/nautilus_librarian/typer/commands/workflows/actions/delete_base_images_action.py b/src/nautilus_librarian/typer/commands/workflows/actions/delete_base_images_action.py index 7ca2ada..79fc954 100644 --- a/src/nautilus_librarian/typer/commands/workflows/actions/delete_base_images_action.py +++ b/src/nautilus_librarian/typer/commands/workflows/actions/delete_base_images_action.py @@ -1,7 +1,7 @@ from os import path, remove -from nautilus_librarian.domain.file_locator import file_locator from nautilus_librarian.domain.dvc_services_api import DvcServicesApi +from nautilus_librarian.domain.file_locator import file_locator from nautilus_librarian.mods.dvc.domain.utils import extract_deleted_files_from_dvc_diff from nautilus_librarian.mods.namecodes.domain.filename import Filename from nautilus_librarian.typer.commands.workflows.actions.action_result import ( diff --git a/src/nautilus_librarian/typer/commands/workflows/actions/generate_base_images_action.py b/src/nautilus_librarian/typer/commands/workflows/actions/generate_base_images_action.py index d1874c6..67b1541 100644 --- a/src/nautilus_librarian/typer/commands/workflows/actions/generate_base_images_action.py +++ b/src/nautilus_librarian/typer/commands/workflows/actions/generate_base_images_action.py @@ -1,5 +1,5 @@ -from nautilus_librarian.domain.file_locator import file_locator from nautilus_librarian.domain.dvc_services_api import DvcServicesApi +from nautilus_librarian.domain.file_locator import file_locator from nautilus_librarian.mods.dvc.domain.utils import ( extract_added_and_modified_files_from_dvc_diff, ) diff --git a/src/nautilus_librarian/typer/commands/workflows/actions/rename_base_images_action.py b/src/nautilus_librarian/typer/commands/workflows/actions/rename_base_images_action.py index ad7a94b..6060bf8 100644 --- a/src/nautilus_librarian/typer/commands/workflows/actions/rename_base_images_action.py +++ b/src/nautilus_librarian/typer/commands/workflows/actions/rename_base_images_action.py @@ -1,10 +1,10 @@ from os import makedirs, path +from nautilus_librarian.domain.dvc_services_api import DvcServicesApi from nautilus_librarian.domain.file_locator import ( get_base_image_absolute_path, guard_that_base_image_exists, ) -from nautilus_librarian.domain.dvc_services_api import DvcServicesApi from nautilus_librarian.mods.dvc.domain.utils import extract_renamed_files_from_dvc_diff from nautilus_librarian.mods.namecodes.domain.filename import Filename from nautilus_librarian.typer.commands.workflows.actions.action_result import ( diff --git a/src/nautilus_librarian/typer/commands/workflows/gold_images_processing.py b/src/nautilus_librarian/typer/commands/workflows/gold_images_processing.py index a41a0bf..0ba1e9e 100644 --- a/src/nautilus_librarian/typer/commands/workflows/gold_images_processing.py +++ b/src/nautilus_librarian/typer/commands/workflows/gold_images_processing.py @@ -1,7 +1,7 @@ import typer -from nautilus_librarian.mods.console.domain.utils import get_current_working_directory from nautilus_librarian.domain.dvc_services_api import DvcServicesApi +from nautilus_librarian.mods.console.domain.utils import get_current_working_directory from nautilus_librarian.mods.git.domain.config import ( default_git_user_email, default_git_user_name, diff --git a/tests/test_nautilus_librarian/test_mods/test_dvc/test_domain/test_dvc_services_api.py b/tests/test_nautilus_librarian/test_mods/test_dvc/test_domain/test_dvc_services_api.py index f646cd4..0b2a997 100644 --- a/tests/test_nautilus_librarian/test_mods/test_dvc/test_domain/test_dvc_services_api.py +++ b/tests/test_nautilus_librarian/test_mods/test_dvc/test_domain/test_dvc_services_api.py @@ -7,9 +7,9 @@ import pytest from git import Repo +from nautilus_librarian.domain.dvc_services_api import DvcServicesApi from nautilus_librarian.mods.dvc.domain.api import DvcApiWrapper from nautilus_librarian.mods.dvc.domain.dvc_command_wrapper import dvc -from nautilus_librarian.domain.dvc_services_api import DvcServicesApi def create_librarian_test_contents(temp_dir): From 4b751c394ee58297b569a3b8daebcdd136108174 Mon Sep 17 00:00:00 2001 From: yeraydavidrodriguez Date: Wed, 16 Feb 2022 08:40:28 +0000 Subject: [PATCH 3/5] Activate manual trigger and disable publishing for testing purposes --- .github/workflows/publish-docker-image.yml | 1 + .github/workflows/publish-github-release.yml | 1 + .github/workflows/publish-pypi-package.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index 79d50d1..c8d1d9d 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -4,6 +4,7 @@ on: push: tags: - "*.*.*" + workflow_dispatch jobs: build: diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml index 0ac975c..7610ec5 100644 --- a/.github/workflows/publish-github-release.yml +++ b/.github/workflows/publish-github-release.yml @@ -4,6 +4,7 @@ on: push: tags: - "*.*.*" + workflow_dispatch jobs: build: diff --git a/.github/workflows/publish-pypi-package.yml b/.github/workflows/publish-pypi-package.yml index 81a9979..4f8273b 100644 --- a/.github/workflows/publish-pypi-package.yml +++ b/.github/workflows/publish-pypi-package.yml @@ -4,6 +4,7 @@ on: push: tags: - "*.*.*" + workflow_dispatch jobs: build: From b69c81246348347044666a98f693438b86e36fbe Mon Sep 17 00:00:00 2001 From: yeraydavidrodriguez Date: Wed, 16 Feb 2022 08:42:10 +0000 Subject: [PATCH 4/5] Fix missing colon --- .github/workflows/publish-docker-image.yml | 9 +-------- .github/workflows/publish-github-release.yml | 9 +-------- .github/workflows/publish-pypi-package.yml | 6 +----- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index c8d1d9d..db4bdc4 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -4,7 +4,7 @@ on: push: tags: - "*.*.*" - workflow_dispatch + workflow_dispatch: jobs: build: @@ -72,10 +72,3 @@ jobs: nautiluscyberneering/librarian ghcr.io/${{ github.repository }} - - name: Build and push Docker images - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml index 7610ec5..dbbbdde 100644 --- a/.github/workflows/publish-github-release.yml +++ b/.github/workflows/publish-github-release.yml @@ -4,7 +4,7 @@ on: push: tags: - "*.*.*" - workflow_dispatch + workflow_dispatch: jobs: build: @@ -59,10 +59,3 @@ jobs: [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \ || echo ::set-output name=prerelease::true - - name: Create Release - uses: ncipollo/release-action@v1 - with: - artifacts: "dist/*" - token: ${{ secrets.GITHUB_TOKEN }} - draft: false - prerelease: steps.check-version.outputs.prerelease == 'true' diff --git a/.github/workflows/publish-pypi-package.yml b/.github/workflows/publish-pypi-package.yml index 4f8273b..a675284 100644 --- a/.github/workflows/publish-pypi-package.yml +++ b/.github/workflows/publish-pypi-package.yml @@ -4,7 +4,7 @@ on: push: tags: - "*.*.*" - workflow_dispatch + workflow_dispatch: jobs: build: @@ -51,7 +51,3 @@ jobs: - name: Build Python package run: poetry build - - name: Publish to PyPI - env: - POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }} - run: poetry publish From 938d0fb41f906518860dfe61bad97c2e34fb6b0c Mon Sep 17 00:00:00 2001 From: yeraydavidrodriguez Date: Wed, 16 Feb 2022 08:50:32 +0000 Subject: [PATCH 5/5] Fix extra blank lines --- .github/workflows/publish-docker-image.yml | 1 - .github/workflows/publish-github-release.yml | 1 - .github/workflows/publish-pypi-package.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index db4bdc4..d0e1b64 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -71,4 +71,3 @@ jobs: images: | nautiluscyberneering/librarian ghcr.io/${{ github.repository }} - diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml index dbbbdde..40cb985 100644 --- a/.github/workflows/publish-github-release.yml +++ b/.github/workflows/publish-github-release.yml @@ -58,4 +58,3 @@ jobs: run: | [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \ || echo ::set-output name=prerelease::true - diff --git a/.github/workflows/publish-pypi-package.yml b/.github/workflows/publish-pypi-package.yml index a675284..f082433 100644 --- a/.github/workflows/publish-pypi-package.yml +++ b/.github/workflows/publish-pypi-package.yml @@ -50,4 +50,3 @@ jobs: - name: Build Python package run: poetry build -