Skip to content

Commit

Permalink
Merge branch 'develop' into fix_some_cannot
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase authored Feb 7, 2023
2 parents e730294 + 66b319b commit 504c6e8
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 17 deletions.
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Unfortunately we are not accepting issues on GitHub yet. To report an issue,
please head over to https://trac.sagemath.org, log in with your GitHub account,
and create a ticket there :)
Details to be added shortly, meanwhile feel free to open issues and PRs
6 changes: 1 addition & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
Thanks for contributing to Sage! Unfortunately we are not accepting pull
requests on GitHub yet. To propose a change to Sage, please log in with your
GitHub account at https://trac.sagemath.org, create a ticket, and push your
changes to that ticket as explained in our
[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).
Thanks for contributing to Sage! Detailed instructions to be added shortly.

Please make sure to also have a look at our
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_doc_html/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
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

# Building the documentation has many dependencies, because all
# documented modules are imported and because we use matplotlib to
Expand Down
1 change: 0 additions & 1 deletion src/sage/algebras/quantum_groups/quantum_group_gap.py
Original file line number Diff line number Diff line change
Expand Up @@ -2689,4 +2689,3 @@ def _unpickle_generic_element(parent, data):
ret.append(libgap(data[2 * i]))
ret.append(one * libgap(data[2 * i + 1].subs(q=parent._libgap_q)))
return parent.element_class(parent, F.ObjByExtRep(ret))

1 change: 0 additions & 1 deletion src/sage/combinat/vector_partition.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,3 @@ def __iter__(self):
new_parts = self._parts[i+1:]
for vecpar in VectorPartitions(new_vec, min=self._min, parts=new_parts, distinct=self._distinct, is_repeatable=self._is_repeatable):
yield self.element_class(self, [list(part)] + list(vecpar))

2 changes: 1 addition & 1 deletion src/sage/modular/modform/notes.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
r"""
Design notes
The implementation depends on the fact that we have dimension formulas
Expand Down
1 change: 0 additions & 1 deletion src/sage/rings/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,3 @@ def __iter__(self):
yield self.df

return tuple(prod(_aux(*tup) for tup in pairs))

3 changes: 1 addition & 2 deletions src/sage/sat/solvers/dimacs.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def render_dimacs(clauses, filename, nlits):
fh.close()

def _run(self):
"""
r"""
Run 'command' and collect output.
TESTS:
Expand Down Expand Up @@ -752,4 +752,3 @@ class Kissat(DIMACS):
"""

command = "kissat -q {input}"

4 changes: 2 additions & 2 deletions src/sage/schemes/elliptic_curves/ell_number_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -2301,9 +2301,9 @@ def gens(self, **kwds):
Check that the the point found has infinite order, and that it is on the curve::
sage: P=gg[0]; P.order()
sage: P=gg[0]; P.order() # long time
+Infinity
sage: E.defining_polynomial()(*P)
sage: E.defining_polynomial()(*P) # long time
0
Here is a curve of rank 2::
Expand Down

0 comments on commit 504c6e8

Please sign in to comment.