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

Fix version qualifiers in pyproject.toml files #4632

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Jul 19, 2024

Fixes

Related to #4166 by @dhruvkb

Description

@dhruvkb has flagged the fact that the PRs migrating to PDM were setting versions incorrectly, not in the way we use in the API.
This PR updates the version qualifiers:
>=x.y -> >=x.y.z, <x+1.
This prevents PDM from updating the version to the next major version.

Testing Instructions

CI should pass.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (ov just catalog/generate-docs for catalog
    PRs) or the media properties generator (ov just catalog/generate-docs media-props
    for the catalog or ov just api/generate-docs for the API) where applicable.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@obulat obulat self-assigned this Jul 19, 2024
@obulat obulat requested a review from a team as a code owner July 19, 2024 05:12
@obulat obulat requested review from sarayourfriend, stacimc and dhruvkb and removed request for sarayourfriend July 19, 2024 05:12
@openverse-bot openverse-bot added 🧱 stack: mgmt Related to repo management and automations 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Jul 19, 2024
@obulat obulat added 🟩 priority: low Low priority and doesn't need to be rushed 💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users and removed 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Jul 19, 2024
Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for accommodating these changes!

It seems like the content hash was updated for utilities/dead_links, but didn't for the other 2 utilities projects?

Signed-off-by: Olga Bulat <obulat@gmail.com>
@obulat
Copy link
Contributor Author

obulat commented Jul 19, 2024

It seems like the content hash was updated for utilities/dead_links, but didn't for the other 2 utilities projects?

I'm not sure why that happened.
I re-ran pdm install but it didn't update the lock file. There was a warning WARNING: Lockfile is generated on an older version of PDM, so I deleted the lock file and re-ran pdm install, and the lock file updated the hash, groups and some other dependencies.

Do you know if the lock files are not updated when different pdm versions are used, @dhruvkb ?

Signed-off-by: Olga Bulat <obulat@gmail.com>
@dhruvkb
Copy link
Member

dhruvkb commented Jul 19, 2024

Sorry, I don't know what happens if PDM encounters a lockfile generated by an older version of itself.

@obulat obulat merged commit 40d4c2b into main Jul 23, 2024
45 checks passed
@obulat obulat deleted the fix/version_qualifiers branch July 23, 2024 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🟩 priority: low Low priority and doesn't need to be rushed 🧱 stack: mgmt Related to repo management and automations
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants