Merge pull request #87 from Nautilus-Cyberneering/issue-86-fix-publis…

…hing-depedency-error

Add installation instructions to publishing workflows

.github/workflows/publish-docker-image.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "*.*.*"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -21,6 +22,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
 
@@ -64,11 +71,3 @@ jobs:
           images: |
             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 }}

.github/workflows/publish-github-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "*.*.*"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -20,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
 
@@ -51,11 +58,3 @@ jobs:
         run: |
           [[ "$(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'

.github/workflows/publish-pypi-package.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "*.*.*"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -18,6 +19,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
 
@@ -43,8 +50,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

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,

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 (

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,
 )

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 (

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,

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):