Merge remote-tracking branch 'origin/main' into hotfix/2.3-merge

# Conflicts:
#	charmcraft/charm_builder.py
#	requirements-dev.txt
#	requirements.txt
#	tests/test_providers.py

Author: lengau

.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,61 @@
+name: Bug Report
+description: File a bug report
+labels: "Bug"
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out this bug report! Before
+        submitting your issue, make sure this has not been already
+        reported or if it works with the latest published version
+        of Charmcraft.
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description
+      description: >
+        If applicable, add screenshots to help explain your
+        problem.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: To Reproduce
+      description: >
+        Provide a step-by-step instruction of how to reproduce the behavior.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: >
+        We need to know a bit more about the context in which Snapcraft failed.
+        - Are you running Charmcraft in destructive-mode, using LXD or Multipass.
+        - On what system is Charmcraft running (e.g.; Ubuntu 22.04 LTS, Windows 11,
+          OS X 10.15).
+    validations:
+      required: true
+  - type: textarea
+    id: charmcraft_yaml
+    attributes:
+      label: charmcraft.yaml
+      description: >
+        If possible, please paste your charmcraft.yaml contents. This
+        will be automatically formatted into code, so no need for
+        backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: >
+        Please copy and paste any relevant log output. This will be
+        automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Charmcraft Discourse
+    url: https://discourse.charmhub.io/c/charmcraft/3
+    about: Issues creating charms
+  - name: Documentation Issues
+    url: https://discourse.charmhub.io/c/doc/22
+    about: Documentation Improvements

.github/ISSUE_TEMPLATE/task.yaml

@@ -0,0 +1,27 @@
+name: Task
+description: File an enhancement proposal
+labels: "Enhancement"
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out this enhancement
+        proposal! Before submitting your issue, please make sure there
+        isn't already a prior issue concerning this. If there is,
+        please join that discussion instead.
+  - type: textarea
+    id: enhancement-proposal-what
+    attributes:
+      label: What needs to get done
+      description: >
+        Describe what needs to get done
+    validations:
+      required: true
+  - type: textarea
+    id: enhancement-proposal-why
+    attributes:
+      label: Why it needs to get done
+      description: >
+        Describe why it needs to get done
+    validations:
+      required: true

.github/renovate.json5

@@ -58,8 +58,8 @@
     }
   ],
   timezone: "Etc/UTC",
-  automergeSchedule: "before 07:00",
-  schedule: "every weekend",
+  automergeSchedule: ["before 07:00"],
+  schedule: ["every weekend"],
   prConcurrentLimit: 5, // No more than 5 open PRs at a time.
   prCreation: "not-pending", // Wait until status checks have completed before raising the PR
   prNotPendingHours: 4, // ...unless the status checks have been running for 4+ hours.

.github/workflows/issues.yaml

@@ -0,0 +1,17 @@
+# this workflow requires to provide JIRA webhook URL via JIRA_URL GitHub Secret
+# read more: https://support.atlassian.com/cloud-automation/docs/jira-automation-triggers/#Automationtriggers-Incomingwebhook
+# original code source: https://github.com/beliaev-maksim/github-to-jira-automation
+
+name: Issues to JIRA
+
+on:
+  issues:
+    # available via github.event.action
+    types: [opened, reopened, closed]
+
+jobs:
+  update:
+    name: Update Issue
+    uses: beliaev-maksim/github-to-jira-automation/.github/workflows/issues_to_jira.yaml@master
+    secrets:
+      JIRA_URL: ${{ secrets.JIRA_URL }}

charmcraft/bases.py

@@ -18,7 +18,7 @@
 
 from typing import Tuple, Union
 
-from charmcraft.config import Base
+from charmcraft.models.charmcraft import Base
 from charmcraft.utils import get_host_architecture, get_os_platform
 
 
@@ -51,7 +51,14 @@ def check_if_base_matches_host(base: Base) -> Tuple[bool, Union[str, None]]:
     if host_base.name != base.name:
         return False, f"name {base.name!r} does not match host {host_base.name!r}"
 
-    if host_base.channel != base.channel:
+    # For Ubuntu, MacOS and Windows, use the full version.
+    # For other OSes, use the major version only.
+
+    if host_base.name in ("ubuntu", "darwin", "windows"):
+        host_channel = host_base.channel
+    else:
+        host_channel = host_base.channel.split(".")[0]
+    if host_channel != base.channel:
         return (
             False,
             f"channel {base.channel!r} does not match host {host_base.channel!r}",

charmcraft/charm_builder.py

@@ -31,32 +31,19 @@
 
 from charmcraft import instrum
 from charmcraft.commands.store.charmlibs import collect_charmlib_pydeps
+from charmcraft.const import (
+    DEPENDENCIES_HASH_FILENAME,
+    DISPATCH_CONTENT,
+    DISPATCH_FILENAME,
+    HOOKS_DIRNAME,
+    MANDATORY_HOOK_NAMES,
+    STAGING_VENV_DIRNAME,
+    VENV_DIRNAME,
+)
 from charmcraft.env import get_charm_builder_metrics_path
 from charmcraft.jujuignore import JujuIgnore, default_juju_ignore
 from charmcraft.utils import make_executable
 
-# Some constants that are used through the code.
-WORK_DIRNAME = "work_dir"
-VENV_DIRNAME = "venv"
-STAGING_VENV_DIRNAME = "staging-venv"
-DEPENDENCIES_HASH_FILENAME = "charmcraft-dependencies-hash.txt"
-
-# The file name and template for the dispatch script
-DISPATCH_FILENAME = "dispatch"
-# If Juju doesn't support the dispatch mechanism, it will execute the
-# hook, and we'd need sys.argv[0] to be the name of the hook but it's
-# getting lost by calling this dispatch, so we fake JUJU_DISPATCH_PATH
-# to be the value it would've otherwise been.
-DISPATCH_CONTENT = """#!/bin/sh
-
-JUJU_DISPATCH_PATH="${{JUJU_DISPATCH_PATH:-$0}}" PYTHONPATH=lib:venv \\
-  exec ./{entrypoint_relative_path}
-"""
-
-# The minimum set of hooks to be provided for compatibility with old Juju
-MANDATORY_HOOK_NAMES = {"install", "start", "upgrade-charm"}
-HOOKS_DIR = "hooks"
-
 
 def relativise(src, dst):
     """Build a relative path from src to dst."""
@@ -204,7 +191,7 @@ def handle_dispatcher(self, linked_entrypoint):
         # bunch of symlinks, to support old juju: verify that any of the already included hooks
         # in the directory is not linking directly to the entrypoint, and also check all the
         # mandatory ones are present
-        dest_hookpath = self.installdir / HOOKS_DIR
+        dest_hookpath = self.installdir / HOOKS_DIRNAME
         if not dest_hookpath.exists():
             dest_hookpath.mkdir()