Merge a205673b4c into 290e92f756

for more information, see https://pre-commit.ci

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly

.github/workflows/installer.yml

@@ -25,13 +25,16 @@ jobs:
     strategy:
       matrix:
         os: [Ubuntu, macOS, Windows]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
         args:
           - ""
           - "--preview"
           - "--git https://github.com/python-poetry/poetry.git"
-          - "--version 1.1.15"
-          - "--version 1.2.0"
         include:
           - os: Ubuntu
             image: ubuntu-22.04
@@ -44,10 +47,10 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -63,7 +66,7 @@ jobs:
         run: python install-poetry.py -y ${{ matrix.args }}
 
       - name: Upload Failure Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: poetry-installer-error.log
@@ -99,7 +102,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Packages
         run: |
@@ -116,7 +119,7 @@ jobs:
         run: python3 install-poetry.py -y
 
       - name: Upload Failure Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: poetry-installer-error.log

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.9.1
+    rev: 24.10.0
     hooks:
       - id: black
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,6 +15,6 @@ repos:
       - id: check-json
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.290
+    rev: v0.7.4
     hooks:
       - id: ruff

install-poetry.py

@@ -22,7 +22,7 @@ installs, or use of pipx as alternatives to executing arbitrary, unversioned cod
 script to alternatives, consider maintaining a local copy as part of your infrastructure.
 
 For full documentation, visit https://python-poetry.org/docs/#installation.
-"""  # noqa: E501
+"""
 import sys
 
 
@@ -557,14 +557,14 @@ class Installer:
                     return 0
 
         try:
-            self.install(version)
+            new_windows_bin = self.install(version)
         except subprocess.CalledProcessError as e:
             raise PoetryInstallationError(
                 return_code=e.returncode, log=e.output.decode()
             ) from e
 
         self._write("")
-        self.display_post_message(version)
+        self.display_post_message(version, new_windows_bin)
 
         return 0
 
@@ -584,7 +584,7 @@ class Installer:
             self.version_file.write_text(version)
             self._install_comment(version, "Done")
 
-            return 0
+            return env.bin_path
 
     def uninstall(self) -> int:
         if not self.data_dir.exists():
@@ -691,30 +691,35 @@ class Installer:
         }
         self._write(PRE_MESSAGE.format(**kwargs))
 
-    def display_post_message(self, version: str) -> None:
+    def display_post_message(self, version: str, new_windows_bin: str) -> None:
         if WINDOWS:
-            return self.display_post_message_windows(version)
+            return self.display_post_message_windows(version, new_windows_bin)
 
         if SHELL == "fish":
             return self.display_post_message_fish(version)
 
         return self.display_post_message_unix(version)
 
-    def display_post_message_windows(self, version: str) -> None:
+    def display_post_message_windows(self, version: str, new_windows_bin: str) -> None:
         path = self.get_windows_path_var()
 
         message = POST_MESSAGE_NOT_IN_PATH
         if path and str(self.bin_dir) in path:
             message = POST_MESSAGE
 
+        if new_windows_bin != self.bin_dir:
+            final_path = new_windows_bin
+        else:
+            final_path = self.bin_dir
+
         self._write(
             message.format(
                 poetry=colorize("info", "Poetry"),
                 version=colorize("b", version),
-                poetry_home_bin=colorize("comment", self.bin_dir),
+                poetry_home_bin=colorize("comment", final_path),
-                poetry_executable=colorize("b", self.bin_dir.joinpath("poetry")),
+                poetry_executable=colorize("b", final_path.joinpath("poetry")),
                 configure_message=POST_MESSAGE_CONFIGURE_WINDOWS.format(
-                    poetry_home_bin=colorize("comment", self.bin_dir)
+                    poetry_home_bin=colorize("comment", final_path)
                 ),
                 test_command=colorize("b", "poetry --version"),
             )