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

Bump to Dulwich 0.20.46 #6506

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Bump to Dulwich 0.20.46 #6506

merged 1 commit into from
Sep 14, 2022

Conversation

jelmer
Copy link
Contributor

@jelmer jelmer commented Sep 13, 2022

Bump to Dulwich 0.20.46.

This version applies applyInsteadOf to rsync-style URLs. Fixes #6329

@mkniewallner
Copy link
Member

Could you run poetry lock --no-update, to update content-hash of the lock file following the update?

@jelmer
Copy link
Contributor Author

jelmer commented Sep 14, 2022

Could you run poetry lock --no-update, to update content-hash of the lock file following the update?

Running that command doesn't appear to change anything related to Dulwich; the hashes were already present from your commit 60168d6

@mkniewallner
Copy link
Member

Could you run poetry lock --no-update, to update content-hash of the lock file following the update?

Running that command doesn't appear to change anything related to Dulwich; the hashes were already present from your commit 60168d6

That's odd. Even content-hash is not updated when you run the command?

On my side, locally, with the same changes:

$ git diff
diff --git a/poetry.lock b/poetry.lock
index 1ed4dba6..fd7c71ea 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -956,7 +956,7 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "7e40cde2399843d53e715f657b703397ce236196663788ada896d7e2a53c869a"
+content-hash = "aab6953ba157fa41e2404572602a0ed1a3d1477e119892753b1551e999c26d37"
 
 [metadata.files]
 attrs = [
diff --git a/pyproject.toml b/pyproject.toml
index 8d95d381..0d24f928 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -70,7 +70,7 @@ tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3"
 virtualenv = ">=20.4.3,!=20.4.5,!=20.4.6"
 xattr = { version = "^0.9.7", markers = "sys_platform == 'darwin'" }
 urllib3 = "^1.26.0"
-dulwich = "^0.20.44"
+dulwich = "^0.20.46"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1"

This is also reflected on the CI build of this PR:

Warning: poetry.lock is not consistent with pyproject.toml. You may be getting improper dependencies. Run `poetry lock [--no-update]` to fix it.

@jelmer
Copy link
Contributor Author

jelmer commented Sep 14, 2022

Oh, the metadata does indeed change. Updated now.

This version applies applyInsteadOf to rsync-style URLs. Fixes python-poetry#6329
@mkniewallner
Copy link
Member

Oh, the metadata does indeed change. Updated now.

Fun timing, it looks like you ran across #6513 (comment) (which is unrelated to the content-hash change).

@mkniewallner mkniewallner merged commit dbc2030 into python-poetry:master Sep 14, 2022
@neersighted neersighted added this to the 1.3 milestone Sep 17, 2022
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git dependencies fail to clone with HTTPS->SSH insteadOf in git config
3 participants