Skip to content

Commit 504c6e8

Browse files
authored
Merge branch 'develop' into fix_some_cannot
2 parents e730294 + 66b319b commit 504c6e8

File tree

9 files changed

+7
-17
lines changed

9 files changed

+7
-17
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Unfortunately we are not accepting issues on GitHub yet. To report an issue,
2-
please head over to https://trac.sagemath.org, log in with your GitHub account,
3-
and create a ticket there :)
1+
Details to be added shortly, meanwhile feel free to open issues and PRs

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
Thanks for contributing to Sage! Unfortunately we are not accepting pull
2-
requests on GitHub yet. To propose a change to Sage, please log in with your
3-
GitHub account at https://trac.sagemath.org, create a ticket, and push your
4-
changes to that ticket as explained in our
5-
[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).
1+
Thanks for contributing to Sage! Detailed instructions to be added shortly.
62

73
Please make sure to also have a look at our
84
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).

build/pkgs/sagemath_doc_html/dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sagelib sphinx pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves furo
1+
sagelib sphinx pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves furo fpylll
22

33
# Building the documentation has many dependencies, because all
44
# documented modules are imported and because we use matplotlib to

src/sage/algebras/quantum_groups/quantum_group_gap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2689,4 +2689,3 @@ def _unpickle_generic_element(parent, data):
26892689
ret.append(libgap(data[2 * i]))
26902690
ret.append(one * libgap(data[2 * i + 1].subs(q=parent._libgap_q)))
26912691
return parent.element_class(parent, F.ObjByExtRep(ret))
2692-

src/sage/combinat/vector_partition.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,3 @@ def __iter__(self):
333333
new_parts = self._parts[i+1:]
334334
for vecpar in VectorPartitions(new_vec, min=self._min, parts=new_parts, distinct=self._distinct, is_repeatable=self._is_repeatable):
335335
yield self.element_class(self, [list(part)] + list(vecpar))
336-

src/sage/modular/modform/notes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""
1+
r"""
22
Design notes
33
44
The implementation depends on the fact that we have dimension formulas

src/sage/rings/generic.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,3 @@ def __iter__(self):
257257
yield self.df
258258

259259
return tuple(prod(_aux(*tup) for tup in pairs))
260-

src/sage/sat/solvers/dimacs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def render_dimacs(clauses, filename, nlits):
357357
fh.close()
358358

359359
def _run(self):
360-
"""
360+
r"""
361361
Run 'command' and collect output.
362362
363363
TESTS:
@@ -752,4 +752,3 @@ class Kissat(DIMACS):
752752
"""
753753

754754
command = "kissat -q {input}"
755-

src/sage/schemes/elliptic_curves/ell_number_field.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,9 +2301,9 @@ def gens(self, **kwds):
23012301
23022302
Check that the the point found has infinite order, and that it is on the curve::
23032303
2304-
sage: P=gg[0]; P.order()
2304+
sage: P=gg[0]; P.order() # long time
23052305
+Infinity
2306-
sage: E.defining_polynomial()(*P)
2306+
sage: E.defining_polynomial()(*P) # long time
23072307
0
23082308
23092309
Here is a curve of rank 2::

0 commit comments

Comments
 (0)