Skip to content

Tests/prefer uv #11625

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Tests/prefer uv #11625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d995d3a
tests - prefer setup using uv
cderv Dec 6, 2024
c5b7da6
Update uv
cderv Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-smokes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Install uv for Python
uses: astral-sh/setup-uv@v3
with:
version: "0.4.30"
version: "0.5.6"
enable-cache: true
cache-dependency-glob: "tests/uv.lock"

Expand Down
14 changes: 3 additions & 11 deletions tests/configure-test-env.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,14 @@ If ($r) {

# Check python test environment ---
Write-Host -ForegroundColor green ">>>> Configuring python environment"
try { $null = gcm py -ea stop; $py=$true} catch {
Write-Host -ForegroundColor red "Missing Python launcher - py.exe is required on Windows - it should be installed with Python for Windows."
try { $null = gcm uv -ea stop; $uv=$true } catch {
Write-Host -ForegroundColor red "No uv found in PATH - Install uv please: https://docs.astral.sh/uv/getting-started/installation/"
}

try { $null = gcm python -ea stop; $python=$true } catch {
Write-Host -ForegroundColor red "No python found in PATH - Check your PATH or install python add to PATH."
}

If ( $py -and $python) {
If ($uv) {
Write-Host "Setting up python environnement with uv"
try { $null = gcm uv -ea stop; $uv=$true } catch {
Write-Host -ForegroundColor red "No uv found in PATH - Install uv please: https://docs.astral.sh/uv/getting-started/installation/"
}
# install from lockfile
uv sync --frozen
$uv=$true
}

# Check Julia environment ---
Expand Down
27 changes: 9 additions & 18 deletions tests/configure-test-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,16 @@ fi

# Check python test environment ---
echo ">>>> Configuring Python environment"
python_exists=$(command -v python)
if [ -z $python_exists ]
then
python_exists=$(command -v python3)
if [ -z python_exists ]
then
echo "No python found in PATH - Check your PATH or install python add to PATH."
fi
fi
if [ -n $python_exists ]
# Prefer uv is available
uv_exist=$(command -v uv)
if [ -z $uv_exist ]
then
uv_exist=$(command -v uv)
if [ -z $uv_exist ]
echo "Setting up python environnement with uv"
# create or sync the virtual env in the project
uv sync --frozen
then
echo "No uv found - Install uv please: https://docs.astral.sh/uv/getting-started/installation/"
fi
echo "Setting up python environnement with uv"
# create or sync the virtual env in the project
uv sync --frozen
else
echo "No uv found - Install uv please: https://docs.astral.sh/uv/getting-started/installation/."
echo "Using 'uv' is the prefered way. You can still use python and create a .venv in the project."
fi

# Check Julia environment ---
Expand Down
Loading