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.

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

Normalise package name before comparison #568

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Normalise package name before comparison #568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d797d4
Normalise package name before comparison
krassowski Apr 16, 2024
56f876f
Use `canonicalize_name` from `packaging`
krassowski Apr 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
8 changes: 5 additions & 3 deletions jupyter_releaser/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from typing import Type, Union

import mdformat
from packaging.utils import canonicalize_name
from packaging.version import parse as parse_version
from pkginfo import SDist, Wheel

Expand Down Expand Up @@ -396,7 +397,7 @@ def publish_assets(

res = python_package.split(":")
python_package_path = res[0]
python_package_name = res[1].replace("-", "_") if len(res) == 2 else ""
python_package_name = canonicalize_name(res[1]) if len(res) == 2 else ""

if release_url and len(glob(f"{dist_dir}/*.whl")):
twine_token = python.get_pypi_token(release_url, python_package_path)
Expand Down Expand Up @@ -427,7 +428,8 @@ def publish_assets(
dist: Union[Type[SDist], Type[Wheel]]
dist = SDist if suffix == ".gz" else Wheel
pkg = dist(path)
if not python_package_name or python_package_name == pkg.name:
pkg_name = canonicalize_name(pkg.name)
if not python_package_name or python_package_name == pkg_name:
env = os.environ.copy()
env["TWINE_PASSWORD"] = twine_token
# NOTE: Do not print the env since a twine token extracted from
Expand All @@ -436,7 +438,7 @@ def publish_assets(
found = True
else:
warnings.warn(
f"Python package name {pkg.name} does not match with name in "
f"Python package name {pkg_name} does not match with name in "
f"jupyter releaser config: {python_package_name}. Skipping uploading dist file {path}",
stacklevel=2,
)
Expand Down
Loading