chore(merge): 'merge-1.26.2' into 'main' (canonical#656)

cmatsuoka · Mar 7, 2024 · bb657f0 · bb657f0
2 parents 3af2588 + 60644b2
commit bb657f0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.26.1
+current_version = 1.26.2
 commit = True
 tag = True
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -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

diff --git a/craft_parts/__init__.py b/craft_parts/__init__.py
@@ -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

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -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)
 -------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -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"

diff --git a/setup.py b/setup.py
@@ -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()