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

misc (Makefile): Fix custom venv treatment in Makefile #3626

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

compor
Copy link
Collaborator

@compor compor commented Dec 11, 2024

This PR:

  • Removes export from UV_PROJECT_ENVIRONMENT, according to here, its function is rather peculiar
  • Adds a missed phony target

My issue is that doing:

  1. VENV_DIR=.vevn make venv
  2. source .venv/bin/activate
  3. make tests

issues the following warning:

warning: VIRTUAL_ENV=.venv does not match the project environment path venv and will be ignored

and leads to failed tests (cannot find riscemu), as uv run according to its documentation will create a venv:

When used in a project, the project environment will be created and updated before invoking the command.

@compor compor added bug Something isn't working misc Miscellaneous labels Dec 11, 2024
@compor compor self-assigned this Dec 11, 2024
Copy link

codecov bot commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.15%. Comparing base (056f76e) to head (a924b51).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3626   +/-   ##
=======================================
  Coverage   90.14%   90.15%           
=======================================
  Files         463      463           
  Lines       58720    58720           
  Branches     5627     5627           
=======================================
+ Hits        52935    52937    +2     
+ Misses       4346     4345    -1     
+ Partials     1439     1438    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@compor compor changed the title Fix custom venv treatment in Makefile misc (Makefile): Fix custom venv treatment in Makefile Dec 11, 2024
@superlopuh superlopuh merged commit 3e999aa into main Dec 12, 2024
15 checks passed
@superlopuh superlopuh deleted the christos/misc/makefile-uv-venv-fix branch December 12, 2024 09:26
@superlopuh
Copy link
Member

I've been wrangling with this locally, thanks for fixing it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working misc Miscellaneous
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants