Skip to content

fix: make dashes underscores in python package names #2073

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
ruben-arts merged 3 commits into from
Sep 18, 2024
Merged

fix: make dashes underscores in python package names #2073

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c8d6b8
fix: make dashes underscores in python package names
ruben-arts Sep 18, 2024
571f743
fix: use PackageName to create the correct name.
ruben-arts Sep 18, 2024
4ba5727
fmt
ruben-arts Sep 18, 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
15 changes: 11 additions & 4 deletions src/cli/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
io::{Error, ErrorKind, Write},
path::{Path, PathBuf},
};

use std::str::FromStr;
use clap::{Parser, ValueEnum};
use miette::{Context, IntoDiagnostic};
use minijinja::{context, Environment};
Expand All @@ -17,7 +17,7 @@ use pixi_utils::conda_environment_file::CondaEnvFile;
use rattler_conda_types::{NamedChannelOrUrl, Platform};
use tokio::fs::OpenOptions;
use url::Url;

use uv_normalize::PackageName;
use crate::Project;

#[derive(Parser, Debug, Clone, PartialEq, ValueEnum)]
Expand Down Expand Up @@ -137,7 +137,7 @@ platforms = {{ platforms }}
{%- endif %}

[tool.pixi.pypi-dependencies]
{{ name }} = { path = ".", editable = true }
{{ pypi_package_name }} = { path = ".", editable = true }

[tool.pixi.tasks]

Expand Down Expand Up @@ -334,12 +334,18 @@ pub async fn execute(args: Args) -> miette::Result<()> {

// Create a 'pyproject.toml' manifest
} else if pyproject {
// Python package names cannot contain '-', so we replace them with '_'
let pypi_package_name = PackageName::from_str(&default_name)
.map(|name| name.as_dist_info_name().to_string())
.unwrap_or_else(|_| default_name.clone());

let rv = env
.render_named_str(
consts::PYPROJECT_MANIFEST,
NEW_PYROJECT_TEMPLATE,
context! {
name => default_name,
pypi_package_name,
version,
author,
channels,
Expand All @@ -350,7 +356,8 @@ pub async fn execute(args: Args) -> miette::Result<()> {
)
.unwrap();
save_manifest_file(&pyproject_manifest_path, rv)?;
let src_dir = dir.join("src").join(default_name);

let src_dir = dir.join("src").join(pypi_package_name);
tokio::fs::create_dir_all(&src_dir)
.await
.into_diagnostic()
Expand Down