Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasdiez committed Dec 5, 2020
1 parent 2492f1e commit 649ffff
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions src/bin/sage-list-packages
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,16 @@ else:
if WARN:
print(WARN)
if args['installed_only']:
L = [pkg for pkg in L if pkg['installed']]
L = [pkg for pkg in L if pkg.installed]
elif args['not_installed_only']:
L = [pkg for pkg in L if not pkg['installed']]
L = [pkg for pkg in L if not pkg.installed]

L.sort(key=lambda pkg: pkg['name'])
L.sort(key=lambda pkg: pkg.name)

# print (while getting rid of None in versions)
for pkg in L:
pkg['installed_version'] = pkg['installed_version'] or 'not_installed'
pkg['remote_version'] = pkg['remote_version'] or '?'
print(format_string.format(**pkg))
pkg.installed_version = pkg.installed_version or 'not_installed'
pkg.remote_version = pkg.remote_version or '?'
print(format_string.format(**pkg._asdict()))
if WARN:
print(WARN)
4 changes: 2 additions & 2 deletions src/sage/doctest/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@ def __init__(self, options, args):
options.optional.discard('optional')
from sage.misc.package import list_packages
for pkg in list_packages('optional', local=True).values():
if pkg['installed'] and pkg['installed_version'] == pkg['remote_version']:
options.optional.add(pkg['name'])
if pkg.installed and pkg.installed_version == pkg.remote_version:
options.optional.add(pkg.name)

from sage.features import package_systems
options.optional.update(system.name for system in package_systems())
Expand Down
26 changes: 13 additions & 13 deletions src/sage/misc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,24 +210,24 @@ def list_packages(*pkg_types, **opts) -> Dict[str, PackageInfo]:
'zn_poly',
'zope_interface']
sage: sage_conf_info = L['sage_conf'] # optional - build
sage: sage_conf_info['type'] # optional - build
sage: sage_conf_info.type # optional - build
'standard'
sage: sage_conf_info['installed'] # optional - build
sage: sage_conf_info.installed # optional - build
True
sage: sage_conf_info['source'] # optional - build
sage: sage_conf_info.source # optional - build
'script'
sage: L = list_packages(pkg_sources=['pip'], local=True) # optional - build internet
sage: bs4_info = L['beautifulsoup4'] # optional - build internet
sage: bs4_info['type'] # optional - build internet
sage: bs4_info.type # optional - build internet
'optional'
sage: bs4_info['source'] # optional - build internet
sage: bs4_info.source # optional - build internet
'pip'
Check the option ``exclude_pip``::
sage: [p for p, d in list_packages('optional', exclude_pip=True).items() # optional - build
....: if d['source'] == 'pip']
....: if d.source == 'pip']
[]
"""
if not pkg_types:
Expand Down Expand Up @@ -422,7 +422,7 @@ def package_versions(package_type, local=False):
sage: std['zn_poly'] # optional - build, random
('0.9.p12', '0.9.p12')
"""
return {pkg['name']: (pkg['installed_version'], pkg['remote_version']) for pkg in list_packages(package_type, local=local).values()}
return {pkg.name: (pkg.installed_version, pkg.remote_version) for pkg in list_packages(package_type, local=local).values()}


def standard_packages():
Expand Down Expand Up @@ -450,8 +450,8 @@ def standard_packages():
('alabaster', 'zope_interface')
"""
pkgs = list_packages('standard', local=True).values()
return (sorted(pkg['name'] for pkg in pkgs if pkg['installed']),
sorted(pkg['name'] for pkg in pkgs if not pkg['installed']))
return (sorted(pkg.name for pkg in pkgs if pkg.installed),
sorted(pkg.name for pkg in pkgs if not pkg.installed))


def optional_packages():
Expand Down Expand Up @@ -483,8 +483,8 @@ def optional_packages():
"""
pkgs = list_packages('optional', local=True)
pkgs = pkgs.values()
return (sorted(pkg['name'] for pkg in pkgs if pkg['installed']),
sorted(pkg['name'] for pkg in pkgs if not pkg['installed']))
return (sorted(pkg.name for pkg in pkgs if pkg.installed),
sorted(pkg.name for pkg in pkgs if not pkg.installed))


def experimental_packages():
Expand All @@ -510,8 +510,8 @@ def experimental_packages():
sage: installed, not_installed = experimental_packages() # optional - build
"""
pkgs = list_packages('experimental', local=True).values()
return (sorted(pkg['name'] for pkg in pkgs if pkg['installed']),
sorted(pkg['name'] for pkg in pkgs if not pkg['installed']))
return (sorted(pkg.name for pkg in pkgs if pkg.installed),
sorted(pkg.name for pkg in pkgs if not pkg.installed))

def package_manifest(package):
"""
Expand Down

0 comments on commit 649ffff

Please sign in to comment.