Skip to content

Commit 26dc962

Browse files
author
Release Manager
committed
sagemathgh-38504: Demote `jmol` to optional <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> - Resolves sagemath#31027 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [x] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#38504 Reported by: Matthias Köppe Reviewer(s): Nathan Dunfield
2 parents 9cb05e6 + 4d1c2d7 commit 26dc962

File tree

8 files changed

+5
-70
lines changed

8 files changed

+5
-70
lines changed

build/pkgs/jmol/type

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
standard
1+
optional

build/pkgs/sagemath_doc_html/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sagelib sphinx sphinx_copybutton sphinx_inline_tabs pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets sage_docbuild elliptic_curves furo fpylll graphs
1+
sagelib sphinx sphinx_copybutton sphinx_inline_tabs pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon ipywidgets sage_docbuild elliptic_curves furo fpylll graphs
22

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

build/pkgs/sagetex/dependencies_check

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(SAGERUNTIME) sympy elliptic_curves jmol
1+
$(SAGERUNTIME) sympy elliptic_curves
22

33
To build SageTeX, you just need Python, but to test (SAGE_CHECK=yes)
44
SageTeX, you actually need to run Sage, produce plots,...

src/doc/en/faq/faq-usage.rst

-29
Original file line numberDiff line numberDiff line change
@@ -479,35 +479,6 @@ How do I run sage in daemon mode, i.e. as a service?
479479
There are several possibilities. Use ``screen``, ``nohup`` or ``disown``.
480480

481481

482-
The show command for plotting 3-D objects does not work.
483-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""
484-
485-
The default live 3-D plotting for Sage 6.4+ uses
486-
`Jmol/JSmol <http://jmol.sourceforge.net>`_
487-
for viewing. From the command line the Jmol Java application is used,
488-
and for in browser viewing either pure javascript or a Java applet
489-
is used. By default in browsers pure javascript is used to avoid
490-
the problems with some browsers that do not support java applet
491-
plugins (namely Chrome). On each browser worksheet there is a
492-
checkbox which must be checked before a 3-D plot is generated if
493-
the user wants to use the Java applet (the applet is a little faster
494-
with complex plots).
495-
496-
The most likely reason for a malfunction is that you do not have
497-
a Java Run Time Environment (JRE) installed or you have one older than
498-
version 1.7. If things work from the command line another possibility
499-
is that your browser does not have the proper plugin to support Java
500-
applets (at present, 2014, plugins do not work with most versions of
501-
Chrome). Make sure you have installed either the IcedTea browser
502-
plugin (for linux see your package manager), see:
503-
`IcedTea <http://icedtea.classpath.org/wiki/IcedTea-Web>`_,
504-
or the Oracle Java plugin see:
505-
`Java <https://java.com/en/download/help/index_installing.xml>`_.
506-
507-
If you are using a Sage server over the web and even javascript rendering
508-
does not work, you may have a problem with your browser's javascript
509-
engine or have it turned off.
510-
511482
May I use Sage tools in a commercial environment?
512483
"""""""""""""""""""""""""""""""""""""""""""""""""
513484

src/doc/en/prep/Symbolics-and-Basic-Plotting.rst

-5
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,6 @@ Below, you can experiment with several of the plotting options.
384384
Basic 3D Plotting
385385
-----------------
386386

387-
There are several mechanisms for viewing three\-dimensional plots in
388-
Sage, but we will stick to the default option in the notebook interface,
389-
which is via javascript applets from the program `Jmol/JSmol
390-
<http://jmol.sourceforge.net/>`_ .
391-
392387
Plotting a 3D plot is similar to plotting a 2D plot, but we need to
393388
specify ranges for two variables instead of one.
394389

src/doc/it/faq/faq-usage.rst

-31
Original file line numberDiff line numberDiff line change
@@ -469,37 +469,6 @@ Ci sono parecchie possibilità. Puoi usare i programmi a riga di comando
469469
``screen``, ``nohup`` o ``disown``.
470470

471471

472-
Il comando show (mostra) per la visualizzazione di oggetti 3D non funziona.
473-
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
474-
475-
La visualizzazione 3D in tempo reale per Sage dalla versione 6.4 in
476-
avanti usa il pacchetto `Jmol/JSmol <http://jmol.sourceforge.net>`_.
477-
Dalla linea di comando viene utilizzata l'applicazione Java Jmol,
478-
mentre per la visualizzazione dal browser viene usato puro javascript
479-
oppure una Java applet. In genere nei browser è usato javascript puro
480-
per evitare problemi con quei browser che non supportano i plugin per
481-
le applet Java (ad esempio Chrome). In ogni worksheet su browser c'è
482-
una casella da spuntare prima di generare una vista tridimensionale
483-
qualora l'utente voglia usare l'applet Java (essa è un po' più veloce
484-
con viste complicate).
485-
486-
La ragione più probabile di un malfunzionamento è che non hai
487-
installato l'ambiente runtime di Java (JRE) o che è più vecchio della
488-
versione 1.7. Se le cose funzionano dalla riga di comando,
489-
un'altra possibilità è che il tuo browser non abbia il plugin giusto
490-
per supportare le Java applet (al momento, nel 2014, tali plugin non
491-
lavorano con la maggior parte delle versioni di Chrome). Assicurati di
492-
aver installato il plugin IcedTea (su Linux vedi il tuo gestore dei
493-
pacchetti) o il plugin di Oracle Java
494-
(vedi: `IcedTea <http://icedtea.classpath.org/wiki/IcedTea-Web>`_
495-
e `Java <https://java.com/en/download/help/index_installing.xml>`_).
496-
497-
Se stai usando un server Sage sul web e anche la visualizzazione
498-
tramite javascript non funziona, potresti avere un problema con la
499-
funzionalità javascript del tuo browser, o potresti aver disabilitato
500-
javascript.
501-
502-
503472
Posso usare gli strumenti di Sage in un ambiente commerciale?
504473
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
505474

src/sage/features/jmol.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self):
3636
filename='JmolData.jar',
3737
search_path=jmol_search_path,
3838
spkg='jmol',
39-
type='standard',
39+
type='optional',
4040
description="Java viewer for chemical structures in 3D")
4141

4242

src/sage/graphs/graph.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
sage: G = graphs.RandomGNP(15,.3)
363363
sage: G.show() # needs sage.plot
364364
365-
And you can view it in three dimensions via jmol with ``show3d()``. ::
365+
And you can view it in three dimensions with ``show3d()``. ::
366366
367367
sage: G.show3d() # needs sage.plot
368368

0 commit comments

Comments
 (0)