Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vcs: use peeled ref when retrieving tag revision #9849

Merged
merged 1 commit into from
Nov 17, 2024

Conversation

abn
Copy link
Member

@abn abn commented Nov 16, 2024

This is required to support incoming changes introduced in dulwich >=0.22.2. This change preserves current behaviour and ensures locks do not change when dulwich is updated.

Note without this change upgrading dulwich will fail integration testing.

@radoering
Copy link
Member

Do we also have to replace head() at this place?

current_sha = current_repo.head().decode("utf-8")

This is required to support incoming changes introduced in dulwich
>=0.22.2. This change preserves current behaviour and ensures locks
do not change when dulwich is updated.
@abn
Copy link
Member Author

abn commented Nov 16, 2024

Yes we should. Good catch, think Ctrl+F skills failed me :D

@radoering radoering merged commit aa73b3a into python-poetry:main Nov 17, 2024
73 checks passed
@jelmer
Copy link
Contributor

jelmer commented Nov 17, 2024

What Dulwich change is this referring to?

@abn abn deleted the fix-dulwich-tag branch November 17, 2024 15:11
reesehyde added a commit to reesehyde/poetry that referenced this pull request Nov 18, 2024
* origin/main:
  Upgrade minimal Cleo to 2.2.1
  make `allow-prereleases` a tri-state setting to really forbid pre-releases if the setting is `false` and keep default behavior to allow pre-releases only if necessary
  feat: add confirmation step
  feat(cli): add info messages about applied migration
  docs: add information about --migrate
  feat(cli): add support for --local for --migrate
  feat(cli): add --migration option to config command
  feat(config): add ConfigSourceMigration
  feat(config): provide method to remove empty config category
  feat(config): add get_property() to ConfigSource
  Ignore http credentials with empty usernames
  Fix regression when using empty username/password
  fix index error for yanked releases without dependencies
  ignore installed packages during solving
  vcs: use peeled ref when retrieving tag revision (python-poetry#9849)
  chore: update json fixtures and improve generate script so that it produces the same results on Linux and Windows
  installer: add option to install without re-resolving (just by evaluating locked markers) (python-poetry#9427) - introduce "installer.re-resolve" config option (default: True) - if the config option is set to False and the lock file is at least version 2.1, the installer will not re-resolve but evaluate locked markers
  locker: lock transitive marker and groups for each package (python-poetry#9427)
  fix: do not ignore local config for implicit PyPI source (python-poetry#9816)
  Cleanup, linting, typing (python-poetry#9839)

# Conflicts:
#	src/poetry/installation/installer.py
#	src/poetry/puzzle/solver.py
reesehyde added a commit to reesehyde/poetry that referenced this pull request Nov 18, 2024
* origin/main:
  Upgrade minimal Cleo to 2.2.1
  make `allow-prereleases` a tri-state setting to really forbid pre-releases if the setting is `false` and keep default behavior to allow pre-releases only if necessary
  feat: add confirmation step
  feat(cli): add info messages about applied migration
  docs: add information about --migrate
  feat(cli): add support for --local for --migrate
  feat(cli): add --migration option to config command
  feat(config): add ConfigSourceMigration
  feat(config): provide method to remove empty config category
  feat(config): add get_property() to ConfigSource
  Ignore http credentials with empty usernames
  Fix regression when using empty username/password
  fix index error for yanked releases without dependencies
  ignore installed packages during solving
  vcs: use peeled ref when retrieving tag revision (python-poetry#9849)
  chore: update json fixtures and improve generate script so that it produces the same results on Linux and Windows
  installer: add option to install without re-resolving (just by evaluating locked markers) (python-poetry#9427) - introduce "installer.re-resolve" config option (default: True) - if the config option is set to False and the lock file is at least version 2.1, the installer will not re-resolve but evaluate locked markers
  locker: lock transitive marker and groups for each package (python-poetry#9427)
  fix: do not ignore local config for implicit PyPI source (python-poetry#9816)
  Cleanup, linting, typing (python-poetry#9839)

# Conflicts:
#	src/poetry/installation/installer.py
#	src/poetry/puzzle/solver.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants