Merge branch 'master' of github.com:3-manifolds/SnapPy

Author: culler

.github/workflows/linux.yml

@@ -11,12 +11,12 @@ jobs:
         os: [ubuntu-20.04]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         name: Install Python
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Install cibuildwheel
         run: |

.github/workflows/macos.yml

@@ -11,12 +11,12 @@ jobs:
         os: [macos-11]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         name: Install Python
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Install cibuildwheel
         run: |

.github/workflows/macos_older_pythons.yml

@@ -0,0 +1,49 @@
+name: macOS Older Python Wheels
+
+on: [push, pull_request]
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-11]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+        name: Install Python
+        with:
+          python-version: '3.9'
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install cibuildwheel
+
+      - name: Build wheels
+        run: |
+          python -m cibuildwheel --output-dir wheelhouse
+        env:
+          # Skip Python 2.7, 3.5, 3.11, 32 bit Linux, and PyPy
+          CIBW_SKIP: cp27-* cp35-* cp38-* cp39-* cp310-* cp311-* pp*
+          CIBW_ARCHS_MACOS: x86_64
+          CIBW_BEFORE_BUILD: >
+            pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
+            pip install --pre --extra-index-url https://test.pypi.org/simple cypari &&
+            pip install git+https://github.com/3-manifolds/PLink &&
+            pip install git+https://github.com/3-manifolds/snappy_manifolds &&
+            pip install git+https://github.com/3-manifolds/Spherogram
+          CIBW_BEFORE_TEST: >
+            pip install cython low_index &&
+            pip install --pre --extra-index-url https://test.pypi.org/simple cypari &&
+            pip install git+https://github.com/3-manifolds/PLink &&
+            pip install git+https://github.com/3-manifolds/snappy_manifolds &&
+            pip install git+https://github.com/3-manifolds/Spherogram
+          CIBW_TEST_COMMAND: python -m snappy.test --skip-modern-opengl
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: snappy_macos_older_wheels
+          path: ./wheelhouse/*.whl

.github/workflows/windows.yml

@@ -11,12 +11,12 @@ jobs:
         os: [windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         name: Install Python
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Install cibuildwheel
         run: |

dev/release_tools/release_steps.rst

@@ -6,21 +6,19 @@ Key tools:
 1. Wheels for all three platforms are built using cibuildwheel as part
    of an automatic GitHub action after each commit.
 
-2. The sdist tarballs are build by a GitHub action of the
+2. The sdist tarballs are built by a GitHub action of the
    "snappy_release" project.
 
-3. The Windows app is also build by a GitHub action of
+3. The Windows and macOS apps is are built by a GitHub actions of
    "snappy_release".
 
-4. Recent macOS apps have been built by Marc directly.
-
-5. The script "test_pypi.py" is a key tool. It creates a virtual
+4. The script "test_pypi.py" is a key tool. It creates a virtual
    environment for testing a package posted on (test)pypi.python.org.
 
-6. Testing done on virtual machines running in VMWare Fusion on
+5. Testing done on virtual machines running in VMWare Fusion on
    dehn.math.illinois.edu.
 
-7. Nathan stores current and old versions in "~/Dropbox/pypi/".
+6. Nathan stores current and old versions in "~/Dropbox/pypi/".
 
 
 Warmup

opengl/CyOpenGL.pyx

@@ -1357,7 +1357,7 @@ class OpenGLPerspectiveWidget(RawOpenGLWidget):
         """
         Help message for the widget.
         """
-        InfoWindow(self, 'Viewer Help', self.help_text)
+        InfoWindow(self, 'Viewer Help', self.help_text, 'viewer_help')
 
     def set_background(self, r, g, b):
         """

python/app.py

@@ -15,7 +15,7 @@
 from .app_menus import add_menu, scut, open_html_docs
 from .browser import Browser
 from .horoviewer import HoroballViewer
-from .infowindow import about_snappy
+from .infowindow import about_snappy, InfoWindow
 from .polyviewer import PolyhedronViewer
 from .raytracing.inside_viewer import InsideViewer
 from .settings import Settings, SettingsDialog
@@ -64,12 +64,21 @@ def __init__(self):
     def add_bindings(self):
         self.window.bind('<<Paste>>', self.edit_paste)
 
+    def about_window(self):
+        window = self.window
+        if not hasattr(window, 'about_snappy'):
+            window.about_snappy = about_snappy(window)
+        else:
+            window.about_snappy.deiconify()
+            window.about_snappy.lift()
+            window.about_snappy.focus_force()
+
     def build_menus(self):
         window = self.window
         self.menubar = menubar = Tk_.Menu(window)
         Python_menu = Tk_.Menu(menubar, name="apple")
         Python_menu.add_command(label='About SnapPy...',
-                                command=lambda : about_snappy(window))
+                                command=self.about_window)
         if sys.platform == 'darwin':
             window.createcommand('::tk::mac::ShowPreferences', self.edit_settings)
             # By default, the Quit menu command terminates the Python process.
@@ -225,6 +234,7 @@ def __init__(self, manifold, root=None, main_window=None):
         self.settings = terminal.settings
         self.menu_title = self.title()
         self.register_window(self)
+        self.dirichlet_viewer.help_button.configure(command=self.dirichlet_help)
 
     def close(self, event=None):
         self.unregister_window(self)
@@ -234,6 +244,26 @@ def apply_settings(self):
         if self.inside_view:
             self.inside_view.apply_settings(self.main_window.settings)
 
+    def dirichlet_help(self):
+        if not hasattr(self, 'polyhedron_help'):
+            self.polyhedron_help = InfoWindow(self, 'Polyhedron Viewer Help',
+                                              self.dirichlet_viewer.widget.help_text,
+                                              'polyhedron_help')
+        else:
+            self.polyhedron_help.deiconify()
+            self.polyhedron_help.lift()
+            self.polyhedron_help.focus_force()
+
+    def horoball_help(self):
+        if not hasattr(self, 'horoviewer_help'):
+            self.horoviewer_help = InfoWindow(self, 'Horoball Viewer Help',
+                                              self.horoball_viewer.widget.help_text,
+                                              'horoviewer_help')
+        else:
+            self.horoviewer_help.deiconify()
+            self.horoviewer_help.lift()
+            self.horoviewer_help.focus_force()
+
 
 class SnapPyLinkEditor(LinkEditor, ListedWindow):
     def __init__(self, root=None, no_arcs=False, callback=None, cb_menu='',
@@ -322,16 +352,44 @@ class SnapPyPolyhedronViewer(PolyhedronViewer):
 
     build_menus = dirichlet_menus
 
-
-class SnapPyInsideViewer(InsideViewer):
-
-    build_menus = inside_view_menus
+    def __init__(self, *args, **kwargs):
+        PolyhedronViewer.__init__(self, *args, **kwargs, main_window=terminal)
+        self.help_button.configure(command=self.help_window)
+
+    def help_window(self):
+        window = self.parent
+        if not hasattr(window, 'polyhedron_help'):
+            window.polyhedron_help = InfoWindow(window,  'Polyhedron Viewer Help',
+                                                self.widget.help_text, 'polyhedron_help')
+        else:
+            window.polyhedron_help.deiconify()
+            window.polyhedron_help.lift()
+            window.polyhedron_help.focus_force()
 
 
 class SnapPyHoroballViewer(HoroballViewer):
 
     build_menus = horoball_menus
 
+    def __init__(self, *args, **kwargs):
+        HoroballViewer.__init__(self, *args, **kwargs, main_window=terminal)
+        self.main_window = terminal
+
+    def help_window(self):
+        window = self.parent
+        if not hasattr(window, 'horoball_help'):
+            window.horoball_help = InfoWindow(window,  'Horoball Viewer Help',
+                                              self.widget.help_text, 'horoball_help')
+        else:
+            window.horoball_help.deiconify()
+            window.horoball_help.lift()
+            window.horoball_help.focus_force()
+
+
+class SnapPyInsideViewer(InsideViewer):
+
+    build_menus = inside_view_menus
+
 
 class SnapPySettings(Settings, ListedWindow):
     def __init__(self, terminal):
@@ -480,6 +538,7 @@ def main():
     LP.PolyhedronViewer = HP.PolyhedronViewer = SnapPyPolyhedronViewer
     LP.HoroballViewer = HP.HoroballViewer = SnapPyHoroballViewer
     snappy.ViewerWindow = SnapPyViewerWindow
+    snappy.ViewerWindow.main_window = terminal
     snappy.InsideViewer = SnapPyInsideViewer
     snappy.InsideViewer.main_window = terminal
     LP.Browser = HP.Browser = SnapPyBrowser

python/app_menus.py

@@ -236,6 +236,11 @@ def browser_menus(self):
     Creates a menubar attribute for the browser.
     """
     self.menubar = menubar = Tk_.Menu(self)
+    if sys.platform == 'darwin' and self.main_window is not None:
+        Python_menu = Tk_.Menu(menubar, name='apple')
+        Python_menu.add_command(label='About SnapPy...',
+                                command=self.main_window.about_window)
+        menubar.add_cascade(label='SnapPy', menu=Python_menu)
     File_menu = Tk_.Menu(menubar, name='file')
     add_menu(self, File_menu, 'Open...', None, 'disabled')
     add_menu(self, File_menu, 'Save as...', self.save)
@@ -247,20 +252,21 @@ def browser_menus(self):
         menubar.add_cascade(label='View', menu=Tk_.Menu(menubar, name='view'))
     menubar.add_cascade(label='Window', menu=WindowMenu(menubar))
     help_menu = HelpMenu(menubar)
-
-    def dirichlet_help():
-        InfoWindow(self, 'Viewer Help', self.dirichlet_viewer.widget.help_text)
-    help_menu.extra_command(label=help_polyhedron_viewer_label, command=dirichlet_help)
-
-    def horoball_help():
-        InfoWindow(self, 'Viewer Help', self.horoball_viewer.widget.help_text)
-    help_menu.extra_command(label=help_horoball_viewer_label, command=horoball_help)
+    help_menu.extra_command(label=help_polyhedron_viewer_label,
+                            command=self.dirichlet_help)
+    help_menu.extra_command(label=help_horoball_viewer_label,
+                            command=self.horoball_help)
     menubar.add_cascade(label='Help', menu=help_menu)
 
 
 def plink_menus(self):
     """Menus for the SnapPyLinkEditor."""
     self.menubar = menubar = Tk_.Menu(self.window)
+    if sys.platform == 'darwin':
+        Python_menu = Tk_.Menu(menubar, name='apple')
+        Python_menu.add_command(label='About SnapPy...',
+                                command=self.main_window.about_window)
+        menubar.add_cascade(label='SnapPy', menu=Python_menu)
     File_menu = Tk_.Menu(menubar, name='file')
     add_menu(self.window, File_menu, 'Open...', self.load)
     add_menu(self.window, File_menu, 'Save as...', self.save)
@@ -293,6 +299,11 @@ def dirichlet_menus(self):
     parent Toplevel.
     """
     self.menubar = menubar = Tk_.Menu(self.parent)
+    if sys.platform == 'darwin':
+        Python_menu = Tk_.Menu(menubar, name='apple')
+        Python_menu.add_command(label='About SnapPy...',
+                                command=self.main_window.about_window)
+        menubar.add_cascade(label='SnapPy', menu=Python_menu)
     File_menu = Tk_.Menu(menubar, name='file')
     add_menu(self.master, File_menu, 'Open...', None, 'disabled')
     add_menu(self.master, File_menu, 'Save as...', None, 'disabled')
@@ -307,7 +318,7 @@ def dirichlet_menus(self):
     menubar.add_cascade(label='Edit ', menu=EditMenu(menubar, self.master.edit_actions))
     menubar.add_cascade(label='Window', menu=WindowMenu(menubar))
     help_menu = HelpMenu(menubar)
-    help_menu.extra_command(label=help_polyhedron_viewer_label, command=self.widget.help)
+    help_menu.extra_command(label=help_polyhedron_viewer_label, command=self.help_window)
     help_menu.activate([help_polyhedron_viewer_label, help_report_bugs_label])
     self.menubar.add_cascade(label='Help', menu=help_menu)
 
@@ -318,6 +329,11 @@ def horoball_menus(self):
     master Toplevel.
     """
     self.menubar = menubar = Tk_.Menu(self.master)
+    if sys.platform == 'darwin':
+        Python_menu = Tk_.Menu(menubar, name='apple')
+        Python_menu.add_command(label='About SnapPy...',
+                                command=self.main_window.about_window)
+        menubar.add_cascade(label='SnapPy', menu=Python_menu)
     File_menu = Tk_.Menu(menubar, name='file')
     add_menu(self.master, File_menu, 'Open...', None, 'disabled')
     add_menu(self.master, File_menu, 'Save as...', None, 'disabled')
@@ -328,7 +344,7 @@ def horoball_menus(self):
     menubar.add_cascade(label='Edit ', menu=EditMenu(menubar, self.master.edit_actions))
     menubar.add_cascade(label='Window', menu=WindowMenu(menubar))
     help_menu = HelpMenu(menubar)
-    help_menu.extra_command(label=help_horoball_viewer_label, command=self.widget.help)
+    help_menu.extra_command(label=help_horoball_viewer_label, command=self.help_window)
     help_menu.activate([help_horoball_viewer_label, help_report_bugs_label])
     self.menubar.add_cascade(label='Help', menu=help_menu)
 
@@ -337,6 +353,11 @@ def inside_view_menus(self):
     """Menus for the standalone Inside viewer.  Called by the view Frame, not the
     master Toplevel."""
     self.menubar = menubar = Tk_.Menu(self.master)
+    if sys.platform == 'darwin':
+        Python_menu = Tk_.Menu(menubar, name='apple')
+        Python_menu.add_command(label='About SnapPy...',
+                                command=self.main_window.about_window)
+        menubar.add_cascade(label='SnapPy', menu=Python_menu)
     File_menu = Tk_.Menu(menubar, name='file')
     add_menu(self.master, File_menu, 'Open...', None, 'disabled')
     add_menu(self.master, File_menu, 'Save as...', None, 'disabled')

python/browser.py

@@ -159,7 +159,6 @@ class Browser(Tk_.Toplevel):
     a notebook with tabs that show numerical or graphical information
     about the manifold.
     """
-
     def __init__(self, manifold, root=None, main_window=None):
         if root is None:
             if Tk_._default_root:
@@ -747,6 +746,12 @@ def edit_copy(self):
         except:
             pass
 
+    def dirichlet_help(self):
+        self.dirichlet_viewer.widget.help()
+
+    def horoball_help(self):
+        self.horoball_viewer.widget.help()
+
     def test(self):
         self.update_idletasks()
         print('Testing browser')