Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.26.2 #656

Merged
merged 9 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.26.1
current_version = 1.26.2
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
# Build Chisel: needs a newer version of go than is available in Ubuntu 20.04
sudo snap install --classic --channel=latest/stable go
git clone https://github.com/canonical/chisel.git chisel-tmp
cd chisel-tmp && git checkout f0bff5a30dfdcb400b # known "good" commit until Chisel has versions
cd chisel-tmp && git checkout v0.9.0
go mod download
sudo go build -o /usr/bin ./...
chisel --help
Expand Down
2 changes: 1 addition & 1 deletion craft_parts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

"""Craft a project from several parts."""

__version__ = "1.26.1"
__version__ = "1.26.2"

from . import plugins
from .actions import Action, ActionProperties, ActionType
Expand Down
6 changes: 4 additions & 2 deletions craft_parts/executor/part_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ def __call__(
*,
stdout: Stream,
stderr: Stream,
) -> StepState: ...
) -> StepState:
lengau marked this conversation as resolved.
Show resolved Hide resolved
...


class _UpdateHandler(Protocol):
Expand All @@ -67,7 +68,8 @@ def __call__(
*,
stdout: Stream,
stderr: Stream,
) -> None: ...
) -> None:
...


class PartHandler:
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog
*********

1.26.2 (2024-02-07)
-------------------

- Fix default setting in aliased part fields
- Fix proxy setting in ant plugin

1.26.1 (2023-12-13)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
author = "Canonical Ltd."

# The full version, including alpha/beta/rc tags
release = "1.26.1"
release = "1.26.2"

# Open Graph configuration - defines what is displayed in the website preview
ogp_site_url = "https://canonical-craft-parts.readthedocs-hosted.com"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from setuptools import find_packages, setup

VERSION = "1.26.1"
VERSION = "1.26.2"

with open("README.md") as readme_file:
readme = readme_file.read()
Expand Down
Loading