Backport PR #16671: Fix some readme bits

story645 · story645 · commit 0cccf26b3069 · 2020-03-07T20:03:46.000-05:00
diff --git a/README.rst b/README.rst
@@ -23,20 +23,24 @@
 .. _Gitter: https://gitter.im/matplotlib/matplotlib
 
 .. |NUMFocus| image:: https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A
-.. _NUMFocus: http://www.numfocus.org
+.. _NUMFocus: https://www.numfocus.org
 
+<<<<<<< HEAD
 
 .. |GitTutorial| image:: https://img.shields.io/badge/PR-Welcome-%23FF8300.svg?
 .. _GitTutorial: https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
 
 .. image:: doc/_static/logo2.png
+=======
+.. image:: https://matplotlib.org/_static/logo2.svg
+>>>>>>> a3e4d0f1b... Merge pull request #16671 from QuLogic/readme-fixes
 
 
 Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.
 
-Check out our `home page <http://matplotlib.org/>`_ for more information.
+Check out our `home page <https://matplotlib.org/>`_ for more information.
 
-.. image:: doc/_static/readme_preview.png
+.. image:: https://matplotlib.org/_static/readme_preview.png
 
 Matplotlib produces publication-quality figures in a variety of hardcopy formats
 and interactive environments across platforms. Matplotlib can be used in Python scripts,
@@ -48,7 +52,7 @@ Install
 =======
 
 For installation instructions and requirements, see `INSTALL.rst <INSTALL.rst>`_  or the
-`install <http://matplotlib.org/users/installing.html>`_ documentation.
+`install <https://matplotlib.org/users/installing.html>`_ documentation.
 
 Test
 ====
@@ -67,7 +71,7 @@ You've worked out a way to fix it – even better!
 
 You want to tell us about it – best of all!
 
-Start at the `contributing guide <http://matplotlib.org/devdocs/devel/contributing.html>`_!
+Start at the `contributing guide <https://matplotlib.org/devdocs/devel/contributing.html>`_!
 
 Contact
 =======
diff --git a/setup.py b/setup.py
@@ -224,9 +224,9 @@ def run(self):
         with open('lib/matplotlib/mpl-data/matplotlibrc', 'w') as fd:
             fd.write(''.join(template_lines))
 
-        # Use Readme as long description
-        with open('README.rst') as fd:
-            long_description = fd.read()
+    # Use Readme as long description
+    with open('README.rst', encoding='utf-8') as fd:
+        long_description = fd.read()
 
     # Finally, pass this all along to distutils to do the heavy lifting.
     setup(
