Merge branch 'main' into stepsecurity_remediation_1688317710

.github/constraints.txt

@@ -0,0 +1 @@
+poetry==1.6.1

.github/workflows/ci.yml

@@ -7,7 +7,6 @@ on:
 
 env:
  python_version: '3.11'
- poetry_version: '1.2.2'
 
 name: CI
 
@@ -35,13 +34,18 @@ jobs:
  python-version: ${{ env.python_version }}
  - name: Lint with Pre-commit
  uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507 # v3.0.0
+ - name: Check Poetry lock file integrity
+ run: |
+ python -m pip install --constraint=.github/constraints.txt poetry
+ poetry config virtualenvs.in-project true
+ poetry check
 
  test:
  needs: lint
  name: Test with Python ${{ matrix.python-version }}
  strategy:
  matrix:
- python-version: ['3.8', '3.9', '3.10', '3.11']
+ python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
  runs-on: windows-latest
  timeout-minutes: 60
  if: "!contains(github.event.head_commit.message, 'skip ci')"
@@ -59,16 +63,17 @@ jobs:
  uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0 # v4.6.1
  with:
  python-version: ${{ matrix.python-version }}
+ allow-prereleases: true
  - name: Use Python Dependency Cache
  uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
  with:
  path: ~\AppData\Local\pip\Cache
  key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
  restore-keys: ${{ runner.os }}-poetry-
  - name: Install Poetry
- run: python -m pip install poetry==${{ env.poetry_version }}
- - name: Configure Poetry
- run: poetry config virtualenvs.in-project true
+ run: |
+  python -m pip install --constraint=.github/constraints.txt poetry
+   poetry config virtualenvs.in-project true
  - name: Install Python Dependencies
  run: poetry install
  - name: Install dependencies
@@ -120,9 +125,9 @@ jobs:
  key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
  restore-keys: ${{ runner.os }}-poetry-
  - name: Install Poetry
- run: python -m pip install poetry==${{ env.poetry_version }}
- - name: Configure Poetry
- run: poetry config virtualenvs.in-project true
+ run: |
+  python -m pip install --constraint=.github/constraints.txt poetry
+   poetry config virtualenvs.in-project true
  - name: Install Python Dependencies
  run: poetry install
  # Temporarily move the preinstalled git, it causes errors related to cygwin.

gvsbuild/patches/expat/0001-CMakeLists-do-not-add-postfix-d-in-debug-builds.patch

@@ -0,0 +1,25 @@
+From cefae9cae833348b5954edb9b214c477a212a434 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Wed, 2 Aug 2023 12:43:56 +0200
+Subject: [PATCH] CMakeLists: do not add postfix d in debug builds
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72cf0b01..842f900c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,7 +426,7 @@ foreach(build_type_upper
+ RELWITHDEBINFO
+ )
+ if(WIN32 AND build_type_upper STREQUAL "DEBUG")
+- set(_POSTFIX_DEBUG "d")
++ set(_POSTFIX_DEBUG "")
+ else()
+ set(_POSTFIX_DEBUG "") # needs a reset because of being looped
+ endif()
+-- 
+2.34.1
+