-
Couldn't load subscription status.
- Fork 183
Fix poetry version mismatch between poetry.lock and precommit check #1003
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
Open
mainred
wants to merge
5
commits into
master
Choose a base branch
from
fix-poetry-mismatch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+871
−714
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
083635c
bump poetry to 1.8.5 in precommit check
mainred 7551b86
use local poetry to lock deps
mainred 0a68ad7
update poetry lock
mainred 1eced2d
revert poetry to 1.8.4
mainred 7ecbab4
Merge branch 'master' of github.com:robusta-dev/holmesgpt into fix-po…
mainred File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| .DS_STORE | ||
| tmp/ | ||
| config.yaml | ||
| bin/ | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,45 @@ | ||
|
|
||
|
|
||
| check: | ||
| poetry run pre-commit run -a | ||
| ##@ Checks | ||
| check: poetry | ||
| ${POETRY} run pre-commit run -a | ||
|
|
||
| test-llm-investigate: poetry | ||
| ${POETRY} run pytest tests/llm/test_investigate.py -n 6 -vv | ||
|
|
||
| test-llm-investigate: | ||
| poetry run pytest tests/llm/test_investigate.py -n 6 -vv | ||
| test-llm-ask-holmes: poetry | ||
| ${POETRY} run pytest tests/llm/test_ask_holmes.py -n 6 -vv | ||
|
|
||
| test-llm-ask-holmes: | ||
| poetry run pytest tests/llm/test_ask_holmes.py -n 6 -vv | ||
| test-without-llm: poetry | ||
| ${POETRY} run pytest tests -m "not llm" | ||
|
|
||
| test-without-llm: | ||
| poetry run pytest tests -m "not llm" | ||
| ##@ Docs | ||
| docs: poetry | ||
| ${POETRY} run mkdocs serve --dev-addr=127.0.0.1:7000 | ||
|
|
||
| docs: | ||
| poetry run mkdocs serve --dev-addr=127.0.0.1:7000 | ||
| docs-build: poetry | ||
| ${POETRY} run mkdocs build | ||
|
|
||
| docs-build: | ||
| poetry run mkdocs build | ||
| docs-strict: poetry | ||
| ${POETRY} run mkdocs serve --dev-addr=127.0.0.1:7000 --strict | ||
|
|
||
| docs-strict: | ||
| poetry run mkdocs serve --dev-addr=127.0.0.1:7000 --strict | ||
| ##@ Dependencies | ||
|
|
||
| deps-install: poetry | ||
| ${POETRY} install | ||
|
|
||
| deps-lock: poetry | ||
| ${POETRY} lock | ||
|
|
||
| ##@ Tools | ||
|
|
||
| POETRY = $(shell pwd)/bin/poetry | ||
| POETRY_VERSION = 1.8.4 | ||
|
|
||
| .PHONY: poetry | ||
| poetry: ## Download poetry locally if necessary. | ||
| @if [ ! -f $(POETRY) ] || ! $(POETRY) --version | grep -q "$(POETRY_VERSION)"; then \ | ||
| echo "Installing poetry $(POETRY_VERSION)"; \ | ||
| curl -sSL https://install.python-poetry.org | POETRY_HOME=$(shell pwd) python3 - --version $(POETRY_VERSION); \ | ||
| rm -f VERSION; \ | ||
| fi | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avoid clobbering the repository when bootstrapping Poetry.
Pointing
POETRY_HOMEat$(pwd)makes the installer unpack Poetry’s tarball straight into the repo root. That drops (and overwrites) files such aspyproject.toml,poetry.lock,README.md,lib/, etc., so a singlemakerun can corrupt the project and leave a pile of untracked artifacts. Please isolate Poetry into a dedicated directory (e.g..poetry/) and stop deletingVERSIONmanually.(Also remember to ignore the new
.poetry/directory.)🧰 Tools
🪛 checkmake (0.2.2)
[warning] 39-39: Missing required phony target "all"
(minphony)
[warning] 39-39: Missing required phony target "clean"
(minphony)
[warning] 39-39: Missing required phony target "test"
(minphony)
🤖 Prompt for AI Agents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can simply use
$(shell pwd)/bin/poetryinstead of$(shell pwd)/.poetrybin/poetryfor the path of poetry, and bin is the folder for all other toolshttps://install.python-poetry.org ues
POETRY_HOME/binas the target place to store the poetry binary, and append it to PATH.The VERSION file is created by https://install.python-poetry.org to manage the version of poetry, which is not necessary for us.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
@mainred, thank you for the clarification! Let me verify the Poetry installer behavior to understand if my concern about file corruption was accurate.
🌐 Web query:
💡 Result:
Short answer — what the installer does and what POETRY_HOME contains
Default location:
If you set POETRY_HOME, the installer installs under that directory (POETRY_HOME/bin, POETRY_HOME/lib, …). Example: POETRY_HOME=/etc/poetry → poetry command placed in /etc/poetry/bin. [1][2]
Files/directories created (typical layout):
Uninstall: run the installer again with --uninstall or set POETRY_UNINSTALL=1 when running the installer; it will remove the installed files. [1]
Sources: Poetry installer README and related installer discussion/documentation. [1][2][3]
@mainred, thank you for the explanation! You're absolutely right about the Poetry installer behavior. After checking the documentation, I can see that:
POETRY_HOME/bin/andPOETRY_HOME/lib/- so withPOETRY_HOME=$(shell pwd), the binary goes tobin/poetryas you intendedVERSIONfile cleanup makes sense - it's just installer metadata that you don't need to keepHowever, I should note that the installer will also create a
lib/directory in the repository root (alongsidebin/) containing Poetry's Python packages. Since you're intentionally usingbin/for tools, you might want to addlib/to.gitignoreas well to keep Poetry's internal packages out of version control.Your approach is valid - using the repository root as
POETRY_HOMEwithbin/as your tools directory is a reasonable pattern. My original concern about file corruption was overstated given this intentional design.The current implementation looks good for your use case! The
bin/directory is already in.gitignorebased on the changes in this PR, which covers the main artifact you care about.