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

Loosen platformdirs dependency #8668

Merged
merged 1 commit into from
Nov 20, 2023

Conversation

stefanor
Copy link
Contributor

4.x is backwards compatible with 3.x except that site_cache_dir has moved to /var/cache. Poetry doesn't use this.

https://github.com/platformdirs/platformdirs/releases/tag/4.0.0

@stefanor stefanor force-pushed the platformdirs-4 branch 2 times, most recently from 13119bb to 5ffffa2 Compare November 14, 2023 09:12
@dimbleby
Copy link
Contributor

if you instead of doing a full re-lock went poetry lock --no-update then I expect you wouldn't get merge conflicts

@NeilGirdhar
Copy link
Contributor

@dimbleby This PR fixes the Poetry source dependency itself—it's not about any project.

@dimbleby
Copy link
Contributor

@NeilGirdhar I don't know what you think I wrote but you are talking past it

this merge request currently has merge conflicts, I expect those would be avoided if poetry.lock had been updated by poetry lock --no-update

@NeilGirdhar
Copy link
Contributor

Oh, sorry, I misunderstood your comment.

@stefanor
Copy link
Contributor Author

Rebased with poetry lock --no-update.

My expectation was that any change to pyproject would change content-hash and so conflicts were inevitable. Such is life with lock files...

@radoering
Copy link
Member

My expectation was that any change to pyproject would change content-hash and so conflicts were inevitable. Such is life with lock files...

That's correct. Can you please re-lock (--no-update) with the latest poetry version (1.7.1)? (If the lockfile does not change just change the hash and do again.)

4.x is backwards compatible with 3.x except that site_cache_dir has
moved to /var/cache. Poetry doesn't use this.
@stefanor
Copy link
Contributor Author

That's correct. Can you please re-lock (--no-update) with the latest poetry version (1.7.1)? (If the lockfile does not change just change the hash and do again.)

Done. The content is as-before, with a different version in the comment. 🤷

@radoering
Copy link
Member

Done. The content is as-before, with a different version in the comment. 🤷

That's fine. We just want to make sure, we always use the latest version in the project.

@radoering radoering merged commit eb80d10 into python-poetry:master Nov 20, 2023
20 checks passed
@stefanor stefanor deleted the platformdirs-4 branch November 22, 2023 22:00
MrGreenTea pushed a commit to MrGreenTea/poetry that referenced this pull request Dec 18, 2023
4.x is backwards compatible with 3.x except that site_cache_dir has
moved to /var/cache. Poetry doesn't use this.
Copy link

github-actions bot commented Mar 3, 2024

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 Mar 3, 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.

None yet

4 participants