revert poetry

hemnstill · Dec 14, 2024 · d0db9e1 · d0db9e1
1 parent d85280f
commit d0db9e1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 32 deletions.
diff --git a/.github/workflows/poetry.yml b/.github/workflows/poetry.yml
@@ -42,7 +42,7 @@ jobs:
     uses: ./.github/workflows/release.yml
     with:
       workflow: ${{ github.workflow }}
-      tool_version: '1.8.5'
+      tool_version: '1.8.3'
       prepare_body: |
         bsdtar -Oxf ./build-gnu/build-gnu.tar.gz build-gnu.md >> body.md
         bsdtar -Oxf ./build-msvc/build-msvc.tar.gz build-msvc.md >> body.md

diff --git a/README.md b/README.md
diff --git a/poetry/build_gnu.sh b/poetry/build_gnu.sh
@@ -2,17 +2,12 @@
 dp0="$(realpath "$(dirname "$0")")"
 set -e
 
-export DEBIAN_FRONTEND=noninteractive
-
 apt update
-apt install -y wget binutils curl build-essential clang pkg-config libssl-dev
-
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-source "$HOME/.cargo/env"
+apt install -y wget binutils
 
 tool_name="poetry"
-tool_version="1.8.5"
-python_self_name="python-3.13.1"
+tool_version="1.8.3"
+python_self_name="python-3.12.5"
 self_name="$tool_name-$tool_version"
 self_toolset_name="build-gnu"
 release_version_dirpath="$dp0/release/$self_name"
@@ -38,7 +33,6 @@ echo "::endgroup::"
 echo "::group::build"
 
 echo "install poetry ..."
-"$cpython_bin" -m pip install msgpack --no-binary=msgpack
 "$cpython_bin" -m pip install "poetry==$tool_version"
 "$cpython_bin" -m poetry self add poetry-plugin-sort
 "$cpython_bin" -m poetry self lock

diff --git a/poetry/build_msvc.sh b/poetry/build_msvc.sh
@@ -3,8 +3,8 @@ dp0="$(realpath "$(dirname "$0")")"
 set -e
 
 tool_name="poetry"
-tool_version="1.8.5"
-python_self_name="python-3.13.1"
+tool_version="1.8.3"
+python_self_name="python-3.12.5"
 self_name="$tool_name-$tool_version"
 self_toolset_name="build-msvc"
 release_version_dirpath="$dp0/release/$self_name"

diff --git a/poetry/test_linux.sh b/poetry/test_linux.sh
@@ -18,7 +18,7 @@ authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "3.13.1"
+python = "3.12.5"
 requests = "2.28.2"
 mysqlclient = "2.2.1"
 
@@ -42,7 +42,7 @@ Package operations: 6 installs, 0 updates, 0 removals
 Writing lock file'
 
 test_version() {
-  assertEquals "Poetry (version 1.8.5)" "$(../bin/poetry.sh --version)"
+  assertEquals "Poetry (version 1.8.3)" "$(../bin/poetry.sh --version)"
 }
 
 test_version_plugins() {

diff --git a/poetry/test_windows.sh b/poetry/test_windows.sh
@@ -14,7 +14,7 @@ authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "3.13.1"
+python = "3.12.5"
 requests = "2.28.2"
 mysqlclient = "2.2.1"
 
@@ -30,7 +30,7 @@ Package operations: 6 installs, 0 updates, 0 removals
 '
 
 test_version() {
-  assertEquals "Poetry (version 1.8.5)" "$(../bin/poetry.bat --version)"
+  assertEquals "Poetry (version 1.8.3)" "$(../bin/poetry.bat --version)"
 }
 
 test_install_from_path() {