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

Commit

Permalink
Trac #32841: use zlib instead of zn_poly in package list examples.
Browse files Browse the repository at this point in the history
We have a few doctests that list all sage packages, and expect zn_poly
to be the last one listed. Having removed zn_poly, however, zlib is now
the terminal package. Here we update all such tests.
  • Loading branch information
orlitzky committed Jan 13, 2022
1 parent 9c9344b commit d4c75e9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions build/sage_bootstrap/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def list_cls(self, *package_classes, **filters):
arb
autotools
[...]
zn_poly
zlib
$ sage -package list --has-file=spkg-configure.m4 :experimental:
perl_term_readline_gnu
Expand All @@ -62,7 +62,7 @@ def list_cls(self, *package_classes, **filters):
boost_cropped
brial
[...]
zn_poly
zlib
"""
log.debug('Listing packages')
pc = PackageClass(*package_classes, **filters)
Expand Down
4 changes: 2 additions & 2 deletions build/sage_bootstrap/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
arb
autotools
[...]
zn_poly
zlib
$ sage --package list :standard: | sort
arb
backports_ssl_match_hostname
[...]
zn_poly
zlib
"""


Expand Down
9 changes: 4 additions & 5 deletions src/sage/misc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
'alabaster',
'arb',
...
'zlib',
'zn_poly']
'zlib']
Functions
---------
Expand Down Expand Up @@ -263,7 +262,7 @@ def list_packages(*pkg_types: str, pkg_sources: List[str] = ['normal', 'pip', 's
'arb',
'babel',
...
'zn_poly']
'zlib']
sage: sage_conf_info = L['sage_conf'] # optional - build
sage: sage_conf_info.type # optional - build
'standard'
Expand Down Expand Up @@ -473,8 +472,8 @@ def package_versions(package_type, local=False):
sage: std = package_versions('standard', local=True) # optional - build
sage: 'gap' in std # optional - build
True
sage: std['zn_poly'] # optional - build, random
('0.9.p12', '0.9.p12')
sage: std['zlib'] # optional - build, random
('1.2.11.p0', '1.2.11.p0')
"""
return {pkg.name: (pkg.installed_version, pkg.remote_version) for pkg in list_packages(package_type, local=local).values()}

Expand Down

0 comments on commit d4c75e9

Please sign in to comment.