From ca57965c95687301e8c0ea6d80ebdc5475e07a23 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Sat, 22 Jul 2023 01:04:50 -0700 Subject: [PATCH] Remove `3.6` guard when setting `poetry config experimental.system-git-client` We no longer support Python 3.6, so this now always needs to happen. I also bumped the minimum version of `poetry` up to `1.2` as that's when the flag was added. It shouldn't matter, as python will default to the highest version allowed by that version of python, and now that we only support `3.7` onwards that will be the upper bound. --- python/helpers/requirements.txt | 2 +- .../lib/dependabot/python/file_updater/poetry_file_updater.rb | 4 +--- .../python/update_checker/poetry_version_resolver.rb | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/python/helpers/requirements.txt b/python/helpers/requirements.txt index e8b993cba186..fd179420520e 100644 --- a/python/helpers/requirements.txt +++ b/python/helpers/requirements.txt @@ -3,7 +3,7 @@ pip-tools>=6.4.0,<=6.13.0 # Range maintains py36 support TODO: Review python 3. hashin==0.17.0 pipenv==2022.4.8 pipfile==0.0.2 -poetry>=1.1.15,<1.6.0 +poetry>=1.2,<1.6.0 wheel==0.37.1 # Some dependencies will only install if Cython is present diff --git a/python/lib/dependabot/python/file_updater/poetry_file_updater.rb b/python/lib/dependabot/python/file_updater/poetry_file_updater.rb index 219dcfe13b88..ca7b6e8523b2 100644 --- a/python/lib/dependabot/python/file_updater/poetry_file_updater.rb +++ b/python/lib/dependabot/python/file_updater/poetry_file_updater.rb @@ -188,9 +188,7 @@ def updated_lockfile_content_for(pyproject_content) language_version_manager.install_required_python # use system git instead of the pure Python dulwich - unless language_version_manager.python_version&.start_with?("3.6") - run_poetry_command("pyenv exec poetry config experimental.system-git-client true") - end + run_poetry_command("pyenv exec poetry config experimental.system-git-client true") run_poetry_update_command diff --git a/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb b/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb index cb3528f2228d..97b113d32c13 100644 --- a/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb +++ b/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb @@ -95,9 +95,7 @@ def fetch_latest_resolvable_version_string(requirement:) language_version_manager.install_required_python # use system git instead of the pure Python dulwich - unless language_version_manager.python_version&.start_with?("3.6") - run_poetry_command("pyenv exec poetry config experimental.system-git-client true") - end + run_poetry_command("pyenv exec poetry config experimental.system-git-client true") # Shell out to Poetry, which handles everything for us. run_poetry_update_command