Skip to content

Commit

Permalink
Merge pull request #8 from ynput/feature/update-to-new-structure
Browse files Browse the repository at this point in the history
Chore: Update to new repository structure
  • Loading branch information
BigRoy authored Oct 14, 2024
2 parents 7bba489 + d586dbd commit 5f6a8f2
Show file tree
Hide file tree
Showing 25 changed files with 543 additions and 234 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/pr_linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 📇 Code Linting

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number}}
cancel-in-progress: true

permissions:
contents: read
pull-requests: write

jobs:
linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: chartboost/ruff-action@v1
15 changes: 14 additions & 1 deletion .github/workflows/release_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,23 @@ name: 🚀 Release Trigger

on:
workflow_dispatch:
inputs:
draft:
type: boolean
description: "Create Release Draft"
required: false
default: true
release_overwrite:
type: string
description: "Set Version Release Tag"
required: false

jobs:
call-release-trigger:
uses: ynput/ops-repo-automation/.github/workflows/release_trigger.yml@main
uses: ynput/ops-repo-automation/.github/workflows/release_trigger.yml@develop
with:
draft: ${{ inputs.draft }}
release_overwrite: ${{ inputs.release_overwrite }}
secrets:
token: ${{ secrets.YNPUT_BOT_TOKEN }}
email: ${{ secrets.CI_EMAIL }}
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,8 @@ Temporary Items
.apdisk

# development environment
server/version.py
server/common/
client/ayon_syncsketch/common/

service/processor/common/

service/poetry.lock

client/ayon_syncsketch/version.py
4 changes: 3 additions & 1 deletion client/ayon_syncsketch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
SyncsketchAddon,
)

__all__ = ("SyncsketchAddon",)
__all__ = (
"SyncsketchAddon",
)
7 changes: 3 additions & 4 deletions client/ayon_syncsketch/addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@

from ayon_core.addon import AYONAddon, IPluginPaths
from ayon_syncsketch.common import config
from .version import __version__

from .version import __version__

SYNCSKETCH_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
SYNCSKETCH_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__))


class SyncsketchAddon(AYONAddon, IPluginPaths):
name = "syncsketch"
enabled = True
version = __version__

def get_syncsketch_config(self, project_name):
Expand All @@ -27,7 +26,7 @@ def get_syncsketch_config(self, project_name):
def get_plugin_paths(self):
return {
"publish": [
os.path.join(SYNCSKETCH_MODULE_DIR, "plugins", "publish")
os.path.join(SYNCSKETCH_ADDON_ROOT, "plugins", "publish")
]
}

Expand Down
13 changes: 8 additions & 5 deletions client/ayon_syncsketch/plugins/publish/integrate_reviewables.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
import json
from copy import deepcopy
from pprint import pformat

import pyblish.api
import requests

from ayon_core.pipeline import KnownPublishError, AYONPyblishPluginMixin
from ayon_core.lib import (
StringTemplate,
BoolDef,
filter_profiles,
prepare_template_data
)
import ayon_syncsketch.common.server_handler import ServerCommunication # noqa: E501
import requests
from ayon_syncsketch.common.server_handler import ServerCommunication


class IntegrateReviewables(pyblish.api.InstancePlugin,
Expand All @@ -32,8 +34,9 @@ class IntegrateReviewables(pyblish.api.InstancePlugin,
review_item_profiles = []

def filter_review_item_profiles(
self, family, host_name, task_name, task_type):
if self.review_item_profiles is []:
self, family, host_name, task_name, task_type
):
if not self.review_item_profiles:
return []

filtering_criteria = {
Expand Down Expand Up @@ -320,4 +323,4 @@ def get_attribute_defs(cls):
default=True,
label="SyncSketch Upload"
)
]
]
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
"""Validate a SyncSketch connection."""
import pyblish.api
from ayon_syncsketch.common.server_handler import ServerCommunication # noqa: E501
import requests

from ayon_syncsketch.common.server_handler import ServerCommunication


class ValidateServerConnection(pyblish.api.ContextPlugin):
"""Validate SyncSketch server connection.
Expand Down
3 changes: 3 additions & 0 deletions client/ayon_syncsketch/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring AYON addon 'syncsketch' version."""
__version__ = "0.1.2-dev.1"
4 changes: 0 additions & 4 deletions client/pyproject.toml

This file was deleted.

Loading

0 comments on commit 5f6a8f2

Please sign in to comment.