From 9e783444d2a855a863c44a98fc267daedf4bd63d Mon Sep 17 00:00:00 2001
From: Ryan Scott <rscott@galois.com>
Date: Fri, 5 May 2023 15:32:29 -0400
Subject: [PATCH 1/2] CI: Upgrade Poetry version

The version we were previously using (1.1.5) is affected by this bug, causing
invocations of Poetry to fail:
https://github.com/ionrock/cachecontrol/issues/292
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c27e27ba4..3fd05777f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -354,7 +354,7 @@ jobs:
 
       - uses: abatilo/actions-poetry@v2.0.0
         with:
-          poetry-version: 1.1.5
+          poetry-version: 1.4.2
 
       - name: ${{ matrix.name }}
         shell: bash
@@ -518,7 +518,7 @@ jobs:
       - if: matrix.image == 'ghcr.io/galoisinc/saw-remote-api'
         uses: abatilo/actions-poetry@v2.0.0
         with:
-          poetry-version: 1.1.5
+          poetry-version: 1.4.2
 
       - if: matrix.image == 'ghcr.io/galoisinc/saw-remote-api'
         name: Test saw-remote-api

From ff3527431ed7a819d590ec20a12191e0ac4a8ad7 Mon Sep 17 00:00:00 2001
From: Ryan Scott <rscott@galois.com>
Date: Tue, 9 May 2023 13:21:07 -0400
Subject: [PATCH 2/2] Python: Use poetry.core.masonry.api as build-backend

This is motivated by a desire to switch away from `setuptools`, which has some
unfortunate interactions with static analysis tools.

This also bumps the following submodules, which apply similar changes:

* `argo` submodule: GaloisInc/argo#197
* `cryptol` submodule: GaloisInc/cryptol#1519
---
 deps/argo                            | 2 +-
 deps/cryptol                         | 2 +-
 saw-remote-api/python/pyproject.toml | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/deps/argo b/deps/argo
index 904fb34872..2a00d329cd 160000
--- a/deps/argo
+++ b/deps/argo
@@ -1 +1 @@
-Subproject commit 904fb34872fcef462030fe38978842aa5a9db903
+Subproject commit 2a00d329cd850d1adcf19348eea3e952730431b7
diff --git a/deps/cryptol b/deps/cryptol
index 9382d52754..5eff6e530c 160000
--- a/deps/cryptol
+++ b/deps/cryptol
@@ -1 +1 @@
-Subproject commit 9382d527543db70068b71fe3a327cd07fe0b36c8
+Subproject commit 5eff6e530c409b89cb3355398297cb20a219a8df
diff --git a/saw-remote-api/python/pyproject.toml b/saw-remote-api/python/pyproject.toml
index 2228786319..9bbac633ac 100644
--- a/saw-remote-api/python/pyproject.toml
+++ b/saw-remote-api/python/pyproject.toml
@@ -21,4 +21,5 @@ argo-client = "0.0.11"
 mypy = "^0.991"
 
 [build-system]
-requires = ["poetry>=1.1.4", "setuptools>=40.8.0"]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"