Merge pull request #386 from CAM-Gerlach/update-spyder-links

Update obsolete links to Spyder main website, docs, google group/mailing list and download

NOTICE.txt

@@ -199,7 +199,7 @@ six 1.10.0
 Spyder 3.2.3 (modified)
     Copyright (c) 2009- The Spyder Development Team
     Licensed under the terms of the MIT License
-    https://github.com/spyder-ide/spyder
+    https://www.spyder-ide.org/
 
 SymPy 1.1.1	
     Copyright (c) 2006-2016 SymPy Development Team

README.md

@@ -58,7 +58,7 @@ te.plotArray(result)
 Tellurium can either be installed with a front-end (Notebook, IDE) or as a Python package:
 
 A. [Notebook front-end](#front-end-1-tellurium-notebook)  
-B. [IDE front-end](#front-end-2-tellurium-spyder-ide) based on [Spyder2](https://github.com/spyder-ide/spyder)  
+B. [IDE front-end](#front-end-2-tellurium-spyder-ide) based on [Spyder2](https://www.spyder-ide.org/)
 C. [Python package (pip)](#install-via-pip-no-front-end)
 
 We recommend first-time users choose one of the front-ends, while developers looking to integrate Tellurium use the pip package. 

docs/appendix.rst

@@ -37,4 +37,4 @@ The Tellurium project is funded by generous support from **NIH/NIGMS** grant GM0
 Acknowledgments
 ===============
 
-Tellurium relies on many great open-source projects, including the `Spyder IDE <https://github.com/spyder-ide/spyder>`_, `nteract <https://github.com/nteract/nteract>`_, `Python <https://www.python.org/>`_, `numpy <http://www.numpy.org/>`_, `Jupyter <http://jupyter.org/>`_, CVODE, NLEQ, AUTO2000, `LAPACK <http://www.netlib.org/lapack/>`_, `LLVM <https://llvm.org/>`_, and `the POCO libraries <https://pocoproject.org/>`_. Tellurium also relies on open source contributions from Frank Bergmann (libStruct, `libSEDML <https://github.com/fbergmann/libSEDML>`_), Mike Hucka,  Sarah Keating (`libSBML <https://sourceforge.net/projects/sbml>`_), and Pierre Raybaut.
+Tellurium relies on many great open-source projects, including the `Spyder IDE <https://www.spyder-ide.org/>`_, `nteract <https://github.com/nteract/nteract>`_, `Python <https://www.python.org/>`_, `numpy <http://www.numpy.org/>`_, `Jupyter <http://jupyter.org/>`_, CVODE, NLEQ, AUTO2000, `LAPACK <http://www.netlib.org/lapack/>`_, `LLVM <https://llvm.org/>`_, and `the POCO libraries <https://pocoproject.org/>`_. Tellurium also relies on open source contributions from Frank Bergmann (libStruct, `libSEDML <https://github.com/fbergmann/libSEDML>`_), Mike Hucka,  Sarah Keating (`libSBML <https://sourceforge.net/projects/sbml>`_), and Pierre Raybaut.

docs/installation.rst

@@ -44,7 +44,7 @@ Tellurium's notebook front-end mixes code and narrative in a flowing, visual sty
 Front-end 2: Tellurium IDE
 ==========================
 
-User who are more familiar with MATLAB may prefer Tellurium's IDE interface, which is based on popular programming tools (Visual Studio, etc.). This front-end is based on the `Spyder project <https://pythonhosted.org/spyder/>`_. Due to stability issues, we recommend Mac users use the Tellurium notebook front-end instead.
+User who are more familiar with MATLAB may prefer Tellurium's IDE interface, which is based on popular programming tools (Visual Studio, etc.). This front-end is based on the `Spyder project <https://www.spyder-ide.org/>`_. Due to stability issues, we recommend Mac users use the Tellurium notebook front-end instead.
 
 .. |billy2| image:: ./images/windows.png
    :scale: 50%

docs/walkthrough.rst

@@ -389,7 +389,7 @@ Sometimes, IPython console might crash. Sometimes, you might want to restart the
 Further Reading
 ---------------
 
-* `Official Spyder documentation <http://pythonhosted.org/spyder/>`_
+* `Official Spyder documentation <https://docs.spyder-ide.org/>`_
 
 Advanced Topics on Tellurium Spyder
 ===================================

spyder_mod/Spyder 2.3.8/scripts/spyder_win_post_install.py

@@ -41,7 +41,7 @@ def install():
     lib_dir = distutils.sysconfig.get_python_lib(plat_specific=1)
     ico_dir = osp.join(lib_dir, 'spyderlib', 'windows')
 
-    desc = 'Scientific Python Development EnvironmEnt, an alternative to IDLE'
+    desc = 'The Scientific Python Development Environment'
     fname = osp.join(start_menu, 'Tellurium Spyder.lnk')
     create_shortcut(pythonw, desc, fname, '"%s"' % script, workdir,
                     osp.join(ico_dir, 'Tellurium.ico'))
@@ -71,7 +71,7 @@ def install():
     # Create desktop shortcut file
     desktop_folder = get_special_folder_path("CSIDL_DESKTOPDIRECTORY")
     fname = osp.join(desktop_folder, 'Spyder.lnk')
-    desc = 'Scientific Python Development EnvironmEnt, an alternative to IDLE'
+    desc = 'The Scientific Python Development Environment'
     create_shortcut(pythonw, desc, fname, '"%s"' % script, workdir,
                     osp.join(ico_dir, 'spyder.ico'))
     file_created(fname)

spyder_mod/Spyder 2.3.8/setup.py

@@ -8,7 +8,7 @@
 Spyder
 ======
 
-The Scientific PYthon Development EnviRonment
+The Scientific Python Development Environment
 """
 
 from __future__ import print_function
@@ -227,17 +227,18 @@ def get_packages():
 
 setup(name=NAME,
       version=__version__,
-      description='Scientific PYthon Development EnviRonment',
+      description='The Scientific Python Development Environment',
       long_description=WININST_MSG + \
-"""Spyder is an interactive Python development environment providing 
-MATLAB-like features in a simple and light-weighted software.
-It also provides ready-to-use pure-Python widgets to your PyQt4 or 
-PySide application: source code editor with syntax highlighting and 
-code introspection/analysis features, NumPy array editor, dictionary 
-editor, Python console, etc.""",
-      download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
-      author="Pierre Raybaut",
-      url=__project_url__,
+"""Spyder is a powerful scientific environment written in Python, for Python,
+and designed by and for scientists, engineers and data analysts.
+It features a unique combination of the advanced editing, analysis, debugging
+and profiling functionality of a comprehensive development tool with the data
+exploration, interactive execution, deep inspection and beautiful visualization
+capabilities of a scientific package.""",
+      download_url="https://www.spyder-ide.org/#fh5co-download",
+      author="The Spyder Project Contributors",
+      author_email="[email protected]",
+      url="https://www.spyder-ide.org/",
       license='MIT',
       keywords='PyQt4 PySide editor shell console widgets IDE',
       platforms=['any'],

spyder_mod/Spyder 2.3.8/spyderlib/spyder.py

@@ -5,7 +5,7 @@
 # (see spyderlib/__init__.py for details)
 
 """
-Spyder, the Scientific PYthon Development EnviRonment
+Spyder, the Scientific Python Development Environment
 =====================================================
 
 Developped and maintained by the Spyder Development
@@ -894,7 +894,7 @@ def create_edit_action(text, tr_text, icon_name):
                                       'doc', "index.html")
             # * If we totally fail, point to our web build
             if not osp.isfile(spyder_doc):
-                spyder_doc = 'http://pythonhosted.org/spyder'
+                spyder_doc = 'https://docs.spyder-ide.org/'
             else:
                 spyder_doc = file_uri(spyder_doc)
             doc_action = create_bookmark_action(self, spyder_doc,
@@ -1699,7 +1699,7 @@ def about(self):
         QMessageBox.about(self,
             _("About %s") % "Spyder",
             """<b>Spyder %s</b> %s
-            <br>The Scientific PYthon Development EnviRonment
+            <br>The Scientific Python Development Environment
             <p>Copyright &copy; 2009 - 2015 Pierre Raybaut
             <br>Copyright &copy; 2010 - 2015 The Spyder Development Team
             <br>Licensed under the terms of the MIT License
@@ -1719,7 +1719,7 @@ def about(self):
             <p>This project is part of a larger effort to promote and
             facilitate the use of Python for scientific and engineering
             software development. The popular Python distributions
-            <a href="http://continuum.io/downloads">Anaconda</a>,
+            <a href="https://www.anaconda.com/download/">Anaconda</a>,
             <a href="https://winpython.github.io/">WinPython</a> and
             <a href="http://code.google.com/p/pythonxy/">Python(x,y)</a>
             also contribute to this plan.
@@ -1786,7 +1786,7 @@ def report_issue(self):
         QDesktopServices.openUrl(url)
 
     def google_group(self):
-        url = QUrl("http://groups.google.com/group/spyderlib")
+        url = QUrl("https://groups.google.com/group/spyderlib")
         QDesktopServices.openUrl(url)
 
     #---- Global callbacks (called from plugins)

spyder_mod/Spyder 3.1.3/spyder/app/mainwindow.py

@@ -5,7 +5,7 @@
 # (see spyder/__init__.py for details)
 
 """
-Spyder, the Scientific PYthon Development EnviRonment
+Spyder, the Scientific Python Development Environment
 =====================================================
 
 Developped and maintained by the Spyder Project
@@ -908,7 +908,7 @@ def create_edit_action(text, tr_text, icon):
                                     'doc', "index.html")
         # * If we totally fail, point to our web build
         if not osp.isfile(spyder_doc):
-            spyder_doc = 'http://pythonhosted.org/spyder'
+            spyder_doc = 'https://docs.spyder-ide.org/'
         else:
             spyder_doc = file_uri(spyder_doc)
         doc_action = create_action(self, _("Spyder documentation"),
@@ -2276,7 +2276,7 @@ def about(self):
         QMessageBox.about(self,
             _("About %s") % "Spyder",
             """<b>Spyder %s</b> %s
-            <br>The Scientific PYthon Development EnviRonment
+            <br>The Scientific Python Development Environment
             <br>Copyright &copy; The Spyder Project Contributors
             <br>Licensed under the terms of the MIT License
             <p>Created by Pierre Raybaut.
@@ -2289,7 +2289,7 @@ def about(self):
             <p>This project is part of a larger effort to promote and
             facilitate the use of Python for scientific and engineering
             software development. The popular Python distributions
-            <a href="http://continuum.io/downloads">Anaconda</a>,
+            <a href="https://www.anaconda.com/download/">Anaconda</a>,
             <a href="https://winpython.github.io/">WinPython</a> and
             <a href="http://python-xy.github.io/">Python(x,y)</a>
             also contribute to this plan.
@@ -2373,7 +2373,7 @@ def report_issue(self):
 
     @Slot()
     def google_group(self):
-        url = QUrl("http://groups.google.com/group/spyderlib")
+        url = QUrl("https://groups.google.com/group/spyderlib")
         QDesktopServices.openUrl(url)
 
     @Slot()
@@ -2755,7 +2755,7 @@ def _check_updates_ready(self):
         error_msg = self.worker_updates.error
 
         url_r = 'https://github.com/spyder-ide/spyder/releases'
-        url_i = 'http://pythonhosted.org/spyder/installation.html'
+        url_i = 'https://docs.spyder-ide.org/installation.html'
 
         # Define the custom QMessageBox
         box = MessageCheckBox()

spyder_mod/Spyder 3.2.2/spyder/app/mainwindow.py

@@ -5,7 +5,7 @@
 # (see spyder/__init__.py for details)
 
 """
-Spyder, the Scientific PYthon Development EnviRonment
+Spyder, the Scientific Python Development Environment
 =====================================================
 
 Developped and maintained by the Spyder Project
@@ -952,7 +952,7 @@ def create_edit_action(text, tr_text, icon):
                                     'doc', "index.html")
         # * If we totally fail, point to our web build
         if not osp.isfile(spyder_doc):
-            spyder_doc = 'http://pythonhosted.org/spyder'
+            spyder_doc = 'https://docs.spyder-ide.org/'
         else:
             spyder_doc = file_uri(spyder_doc)
         doc_action = create_action(self, _("Spyder documentation"),
@@ -2313,7 +2313,7 @@ def about(self):
         QMessageBox.about(self,
             _("About %s") % "Spyder",
             """<b>Spyder %s</b> %s
-            <br>The Scientific PYthon Development EnviRonment
+            <br>The Scientific Python Development Environment
             <br>Copyright &copy; The Spyder Project Contributors
             <br>Licensed under the terms of the MIT License
             <p>Created by Pierre Raybaut.
@@ -2326,7 +2326,7 @@ def about(self):
             <p>This project is part of a larger effort to promote and
             facilitate the use of Python for scientific and engineering
             software development. The popular Python distributions
-            <a href="http://continuum.io/downloads">Anaconda</a>,
+            <a href="https://www.anaconda.com/download/">Anaconda</a>,
             <a href="https://winpython.github.io/">WinPython</a> and
             <a href="http://python-xy.github.io/">Python(x,y)</a>
             also contribute to this plan.
@@ -2412,7 +2412,7 @@ def report_issue(self, traceback=""):
 
     @Slot()
     def google_group(self):
-        url = QUrl("http://groups.google.com/group/spyderlib")
+        url = QUrl("https://groups.google.com/group/spyderlib")
         QDesktopServices.openUrl(url)
 
     @Slot()
@@ -2834,7 +2834,7 @@ def _check_updates_ready(self):
         error_msg = self.worker_updates.error
 
         url_r = 'https://github.com/spyder-ide/spyder/releases'
-        url_i = 'http://pythonhosted.org/spyder/installation.html'
+        url_i = 'https://docs.spyder-ide.org/installation.html'
 
         # Define the custom QMessageBox
         box = MessageCheckBox(icon=QMessageBox.Information,