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 for src-files not being used when specified in a config file #2015

Merged
merged 6 commits into from Jan 20, 2024

Conversation

csalerno-asml
Copy link
Contributor

@csalerno-asml csalerno-asml commented Nov 3, 2023

This PR fixes #2006

src-files is found in the click context, ctx, but however is not populating the variable src_files, so that it is an empty tuple.
For this reason, the tool will then start to select a requirement file, as shown in the linked issue.

Contributor checklist
  • Included tests for the changes.
  • PR title is short, clear, and ready to be included in the user-facing changelog.
Maintainer checklist
  • Verified one of these labels is present: backwards incompatible, feature, enhancement, deprecation, bug, dependency, docs or skip-changelog as they determine changelog listing.
  • Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

@webknjaz
Copy link
Member

webknjaz commented Nov 4, 2023

@csalerno-asml thanks for starting this! This PR would need a regression test to be mergeable. Could you add one?

@csalerno-asml
Copy link
Contributor Author

Done @webknjaz :)

src/pip-tools Outdated Show resolved Hide resolved
piptools/scripts/compile.py Outdated Show resolved Hide resolved
piptools/scripts/compile.py Show resolved Hide resolved
tests/test_cli_compile.py Outdated Show resolved Hide resolved
tests/test_cli_compile.py Outdated Show resolved Hide resolved
tests/test_cli_compile.py Outdated Show resolved Hide resolved
tests/test_cli_compile.py Outdated Show resolved Hide resolved
@chrysle chrysle added bug Something is not working config Related to pip-tools' configuration labels Nov 8, 2023
Copy link
Contributor

@chrysle chrysle left a comment

Choose a reason for hiding this comment

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

LGTM, but I'd like to hold this back for now per #2006 (comment).

@csalerno-asml
Copy link
Contributor Author

@chrysle fine but this PR is open since August #1966
This one can be merged as-is and then reworked if necessary - or the other one gets a bump

@csalerno-asml
Copy link
Contributor Author

Any update @chrysle @atugushev @webknjaz ?

@webknjaz
Copy link
Member

webknjaz commented Jan 2, 2024

@csalerno-asml #1966 is approved and will be merged once the CI gets unblocked (it's a repo-global blocker).

@chrysle
Copy link
Contributor

chrysle commented Jan 6, 2024

Since that's now merged, could you rebase?

@csalerno-asml
Copy link
Contributor Author

@chrysle done :)

@webknjaz
Copy link
Member

That's not a rebase, though.

@csalerno-asml
Copy link
Contributor Author

@webknjaz I rebased, but then there was a merge conflict (don't know why), so I just merged main inside this branch. There are no conflicts however, so I don't see it as an issue

@webknjaz
Copy link
Member

Well, this will cause a "foxtrot merge".

@csalerno-asml
Copy link
Contributor Author

@webknjaz re-rebased

@chrysle chrysle added this pull request to the merge queue Jan 20, 2024
Merged via the queue into jazzband:main with commit d673c8e Jan 20, 2024
36 checks passed
@chrysle
Copy link
Contributor

chrysle commented Jan 20, 2024

Thanks!

@csalerno-asml
Copy link
Contributor Author

hey @chrysle , do you know when this fix will be released? do you guys have a schedule, or a release strategy?

@csalerno-asml csalerno-asml deleted the fix-2006 branch February 14, 2024 12:33
@webknjaz
Copy link
Member

Not really. There was some shared repo where releases could be requested, I think.

@csalerno-asml
Copy link
Contributor Author

From what I see, this is done manually? #1958

@atugushev
Copy link
Member

Let's make a release. I'll do it today.

@atugushev atugushev added this to the 7.4.0 milestone Feb 16, 2024
@atugushev
Copy link
Member

Released as part of pip-tools v7.4.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is not working config Related to pip-tools' configuration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Specifying source files in pyproject.toml leads to only pyproject.toml being used
4 participants