-
-
Notifications
You must be signed in to change notification settings - Fork 487
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.
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
Fix docstring markup in sage/matroids, sage/geometry, sage/modules #34167
Comments
This comment has been minimized.
This comment has been minimized.
Branch: u/chapoton/34167 |
Commit: |
Author: Frédéric Chapoton |
comment:2
in this one, I could not fix the issue in geometry.. New commits:
|
comment:3
This could be related to #34168 comment:13: the title of the file is "Polyhedra", and this somehow leads to it flagging a line starting with "Polyhedra" as being an error. If you change the first line of the file like this: diff --git a/src/sage/geometry/polyhedron/constructor.py b/src/sage/geometry/polyhedron/constructor.py
index 4606d979cf..4b705b371a 100644
--- a/src/sage/geometry/polyhedron/constructor.py
+++ b/src/sage/geometry/polyhedron/constructor.py
@@ -1,5 +1,5 @@
r"""
-Polyhedra
+Constructing polyhedra
In this module, a polyhedron is a convex (possibly unbounded) set in
Euclidean space cut out by a finite set of linear inequalities and the error will go away. I think this is a bug in the lexer/parser/flake8/whatever, and I would rather someone fix that, but this is a workaround. |
comment:4
Let's defer this failure to a follow-up ticket |
comment:5
Should we remove it from the developer guide? Or should we add it to the directives known to the linter? |
comment:7
I think we should:
diff --git a/src/sage_docbuild/conf.py b/src/sage_docbuild/conf.py
index c9b81a8ba7..5efcc9f86e 100644
--- a/src/sage_docbuild/conf.py
+++ b/src/sage_docbuild/conf.py
@@ -176,7 +176,7 @@ exclude_patterns = ['.build']
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
-#show_authors = False
+show_authors = True
# Default lexer to use when highlighting code blocks, using the IPython
# console lexers. 'ipycon' is the IPython console, which is what we want |
comment:8
(The directive is mainly used in the thematic tutorials where |
comment:9
The same passage in the Developer's guide mentions directives "image", "figure", and "autofunction". The last one is not used, but the others are. Do they need to be added? |
Changed branch from u/chapoton/34167 to u/jhpalmieri/34167 |
Dependencies: 30448 |
Last 10 new commits:
|
comment:12
(Adding to the list of directives requires adding #30448 as a dependency.) |
comment:13
Replying to @jhpalmieri:
I think these two may be built in to the rst spec, so no need to add
I guess autofunction would be good to add, for completeness of the sphinx directives |
Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:
|
Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:
|
comment:16
Replying to @mkoeppe:
Done. Note that I did not revert the change from |
comment:17
LGTM. Thank you. |
comment:18
Merge failure on top of: 8d7c0022e2 Trac #34165: Fix docstring markup in sage/tests/book_stein_modform.py 07e1a716ad Trac #34162: Fix docstring markup in sage/doctest 3cfa5a1b95 Trac #34161: Fix docstring markup in sage/databases 411bb16ba0 Trac #34159: Fix docstring markup in sage/modular 1bc96cee2e Trac #34158: Fix docstring markup in sage/manifolds 87a05b5d35 Trac #34156: Fix docstring markup in sage/game_theory af1bfa810c Trac #34153: pycodestyle cleanup in sage/geometry/hyperplane_arrangement/hyperplane.py 96ab5f3ffc Trac #34146: Modernize super in coding/ 992333a3c7 Trac #34143: three-argument pow() on integers returns IntegerMod 84ea5a2927 Trac #34101: cutwidth_dyn use after free 7812ae01d9 Trac #34086: E231 in src/sage/graphs/strongly_regular_db.pyx - part 1 a9055ca510 Trac #34079: pycodestyle cleanup in 6 files of src/sage/graphs/ 5ed3caeeb4 Trac #34078: pycodestyle cleanup in src/sage/graphs/graph_plot.py 785ba0960e Trac #34077: pycodestyle cleanup in src/sage/graphs/graph_input.py 691239d449 Trac #34073: pycodestyle cleanup in src/sage/graphs/graph_coloring.pyx 061241f24b Trac #34068: pycodestyle cleanup in src/sage/graphs/connectivity.pyx 65b834a993 Trac #33971: Height of a dynamical system is wrong 385b628ef7 Trac #22857: Using symbolic variables in domain 'positive' makes Sage crash cc6a8fb370 Trac #10980: Make sure symbolic gridline values are okay 1a32d02790 Trac #34227: Compute the similarity class type of a given matrix; compute invariant subspace generating function from similarity class type 1f9fbb8fca Trac #34218: Implement longest_increasing_subsequence_number d55f18bd80 Trac #34216: configure: Use --with-system-{gfortran,openssl,python3}=force on Cygwin ffa1104f58 Trac #34214: Faster version of longest_increasing_subsequence_length 4c250eb283 Trac #34208: Remove package sip e8caec9232 Trac #34200: Add importlib_metadata to Sphinx's dependencies 195b7578eb Trac #34189: Remove imports from sage.all and sage.rings.all in sage.rings 8117fe9e0f Trac #34187: Remove src/sage/init.py 99e0db84b0 Trac #34177: Update setuptools to 63.2.0 22e1027795 Trac #34176: update curl to version 7.84 68c736c3c9 Trac #33817: GH Actions: Add test of the modularized distributions 6b7bed7c35 Trac #32406: Make "./configure --enable-editable" the default 2c1e4a1a1b Trac #31568: Add commands "sage --lldb", "sage -t --lldb" 96b57ea0f5 Trac #31451: Faster version of longest_increasing_subsequences 991429de56 Trac #34115: tox.yml: Refactor using reusable workflows, update Linux platforms 05a53e3c45 Trac #33627: Remove sage-gdb-commands from src/bin c17e6377ce Trac #22349: Deprecate sorting of Graph vertices and edges by default c19c47f Trac #34174: insufficient precision in scaling elliptic curves over number fields by units aa8a464 Trac #34172: Fix docstring markup in sage/groups and sage/misc 4142099 Trac #34168: Fix docstring markup in sage/categories e9be172 Trac #34166: Fix docstring markup in sage/tests except sage/tests/book_stein_modform.py 6e41b53 Trac #34164: Fix docstring markup in sage/plot and sage/graphs b03229e Trac #34163: Fix docstring markup in sage/interfaces 46849b8 Trac #34160: Fix docstring markup in sage/schemes 984137b Trac #34155: OpenSSL 3.0.5 security update ced8f29 Trac #34151: get rid of Oops messages in quadratic forms b045663 Trac #34149: make documentation building compatible with sphinx 5 07d4b90 Trac #34105: ZeroDivisionError while reducing a polynomial w.r.t. the zero ideal db21903 Trac #33798: Implement the Links-Gould polynomial invariant for links 04ad7f9 Trac #33705: "make doc-clean" should remove inventory, doctrees 977e691 Trac #33636: replace loadable_module_extension() by importlib.machinery.EXTENSION_SUFFIXES c744d7c Trac #29097: build/make/Makefile.in: Rename make targets SPKG-clean to SPKG-uninstall 8312ee1 Trac #33530: Upgrade ipython to 8.x 067a66c Trac #33428: prompt_toolkit 3.0.25+ breaks Ctrl-C 79ed9e5 Trac #33160: update Singular to 4.3.1 4cc4817 Trac #32088: gfan testsuite hangs on 32bit 10247d5 Trac #31049: "setup.py develop" rewrites the installed sage-version.sh as if it is a Python script 7f71494 Updated SageMath version to 9.7.beta6 merge was not clean: conflicts in src/sage/matroids/graphic_matroid.py |
comment:19
I would rather wait for the next beta to deal with this, rather than try to figure out where the merge conflict is. |
comment:20
Replying to @jhpalmieri:
I agree. On the other hand, I did try to find the conflicting ticket and found that it is #22349. It is tedious to do this manually. It would be useful if we have the command |
comment:21
If that's the conflict, the patch is diff --git a/src/sage/matroids/graphic_matroid.py b/src/sage/matroids/graphic_matroid.py
index f82a2145e9b..bd79b89e94f 100644
--- a/src/sage/matroids/graphic_matroid.py
+++ b/src/sage/matroids/graphic_matroid.py
@@ -344,7 +344,7 @@ class GraphicMatroid(Matroid):
frozenset({4})]
"""
star_list = []
- for v in self._G.vertices():
+ for v in self._G.vertices(sort=False):
star = [l for (_, _, l) in self._G.edges_incident(v)]
star_list.append(frozenset(star))
return frozenset(star_list) |
comment:22
(I'm actually surprised that #22349 hasn't caused more problems, since it's a bit of a patch bomb.) |
Changed branch from u/jhpalmieri/34167 to u/mkoeppe/34167 |
New commits:
|
comment:27
Okay. |
comment:28
dependency of a "critical" ticket |
Changed branch from u/mkoeppe/34167 to |
Changed commit from |
Changed author from Frédéric Chapoton, John Palmieri to Frédéric Chapoton, John Palmieri |
Part of #34157:
Not fixed here (comment:3, comment:4)
Depends on #30448
Depends on #22349
CC: @tscrim @jhpalmieri
Component: documentation
Author: Frédéric Chapoton, John Palmieri
Branch:
f9c8724
Reviewer: Kwankyu Lee
Issue created by migration from https://trac.sagemath.org/ticket/34167
The text was updated successfully, but these errors were encountered: