Skip to content

pep503 #335

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
stonebig merged 1 commit into from
May 23, 2016
Merged

pep503 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions winpython/data/packages.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ description=IDLE Extensions for Python
[idna]
description=Internationalized Domain Names in Applications (IDNA)

[imagesize]
description=Getting image size from png/jpeg/jpeg2000/gif file

[ipyleaflet]
description=A Jupyter widget for dynamic Leaflet maps

Expand Down
9 changes: 6 additions & 3 deletions winpython/wppm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@
# Workaround for installing PyVISA on Windows from source:
os.environ['HOME'] = os.environ['USERPROFILE']


# pep503 defines normalized package names: www.python.org/dev/peps/pep-0503
def normalize(name):
return re.sub(r"[-_.]+", "-", name).lower()

def get_package_metadata(database, name):
"""Extract infos (description, url) from the local database"""
# Note: we could use the PyPI database but this has been written on
Expand All @@ -44,7 +47,7 @@ def get_package_metadata(database, name):
name1 = name.lower()
# wheel replace '-' per '_' in key
for name2 in (name1, name1.split('-')[0], name1.replace('-', '_'),
'-'.join(name1.split('_'))):
'-'.join(name1.split('_')), normalize(name)):
try:
metadata[key] = db.get(name2, key)
break
Expand Down Expand Up @@ -368,7 +371,7 @@ def get_installed_packages(self):
def find_package(self, name):
"""Find installed package"""
for pack in self.get_installed_packages():
if pack.name == name:
if normalize(pack.name) == normalize(name):
return pack


Expand Down