Skip to content

Commit

Permalink
Normalise package name before comparison (#568)
Browse files Browse the repository at this point in the history
* Normalise package name before comparison

* Use `canonicalize_name` from `packaging`
  • Loading branch information
krassowski committed Apr 18, 2024
1 parent e727e21 commit ba6e1a5
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions jupyter_releaser/lib.py
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

0 comments on commit ba6e1a5

Please sign in to comment.