diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..6ca6cbf83d1
--- /dev/null
+++ b/README.md
@@ -0,0 +1,96 @@
+
+
+
+
+# Pillow
+
+## Python Imaging Library (Fork)
+
+Pillow is the friendly PIL fork by [Alex Clark and
+Contributors](https://github.com/python-pillow/Pillow/graphs/contributors).
+PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
+As of 2019, Pillow development is
+[supported by Tidelift](https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=readme&utm_campaign=enterprise).
+
+
+
+ docs |
+
+
+ |
+
+
+ tests |
+
+
+
+
+
+
+
+
+
+ |
+
+
+ package |
+
+
+
+
+
+ |
+
+
+ social |
+
+
+
+ |
+
+
+
+## More Information
+
+- [Documentation](https://pillow.readthedocs.io/)
+ - [Installation](https://pillow.readthedocs.io/en/latest/installation.html)
+ - [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html)
+- [Contribute](https://github.com/python-pillow/Pillow/blob/master/.github/CONTRIBUTING.md)
+ - [Issues](https://github.com/python-pillow/Pillow/issues)
+ - [Pull requests](https://github.com/python-pillow/Pillow/pulls)
+- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
+ - [Pre-fork](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst#pre-fork)
+
+## Report a Vulnerability
+
+To report a security vulnerability, please follow the procedure described in the [Tidelift security policy](https://tidelift.com/docs/security).
diff --git a/README.rst b/README.rst
deleted file mode 100644
index c1d5be57912..00000000000
--- a/README.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-Pillow
-======
-
-Python Imaging Library (Fork)
------------------------------
-
-Pillow is the friendly PIL fork by `Alex Clark and Contributors `_. PIL is the Python Imaging Library by Fredrik Lundh and Contributors. As of 2019, Pillow development is `supported by Tidelift `_.
-
-.. start-badges
-
-.. list-table::
- :stub-columns: 1
-
- * - docs
- - |docs|
- * - tests
- - |linux| |macos| |windows| |gha_lint| |gha| |gha_windows| |gha_docker| |coverage|
- * - package
- - |zenodo| |tidelift| |version| |downloads|
- * - social
- - |gitter| |twitter|
-
-.. end-badges
-
-More Information
-----------------
-
-- `Documentation `_
-
- - `Installation `_
- - `Handbook `_
-
-- `Contribute `_
-
- - `Issues `_
- - `Pull requests `_
-
-- `Changelog `_
-
- - `Pre-fork `_
-
-Report a Vulnerability
-----------------------
-
-To report a security vulnerability, please follow the procedure described in the `Tidelift security policy `_.
-
-.. |docs| image:: https://readthedocs.org/projects/pillow/badge/?version=latest
- :target: https://pillow.readthedocs.io/?badge=latest
- :alt: Documentation Status
-
-.. |linux| image:: https://img.shields.io/travis/python-pillow/Pillow/master.svg?label=Linux%20build
- :target: https://travis-ci.org/python-pillow/Pillow
- :alt: Travis CI build status (Linux)
-
-.. |macos| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/master.svg?label=macOS%20build
- :target: https://travis-ci.org/python-pillow/pillow-wheels
- :alt: Travis CI build status (macOS)
-
-.. |windows| image:: https://img.shields.io/appveyor/build/python-pillow/Pillow/master.svg?label=Windows%20build
- :target: https://ci.appveyor.com/project/python-pillow/Pillow
- :alt: AppVeyor CI build status (Windows)
-
-.. |gha_lint| image:: https://github.com/python-pillow/Pillow/workflows/Lint/badge.svg
- :target: https://github.com/python-pillow/Pillow/actions?query=workflow%3ALint
- :alt: GitHub Actions build status (Lint)
-
-.. |gha_docker| image:: https://github.com/python-pillow/Pillow/workflows/Test%20Docker/badge.svg
- :target: https://github.com/python-pillow/Pillow/actions?query=workflow%3A%22Test+Docker%22
- :alt: GitHub Actions build status (Test Docker)
-
-.. |gha| image:: https://github.com/python-pillow/Pillow/workflows/Test/badge.svg
- :target: https://github.com/python-pillow/Pillow/actions?query=workflow%3ATest
- :alt: GitHub Actions build status (Test Linux and macOS)
-
-.. |gha_windows| image:: https://github.com/python-pillow/Pillow/workflows/Test%20Windows/badge.svg
- :target: https://github.com/python-pillow/Pillow/actions?query=workflow%3A%22Test+Windows%22
- :alt: GitHub Actions build status (Test Windows)
-
-.. |coverage| image:: https://codecov.io/gh/python-pillow/Pillow/branch/master/graph/badge.svg
- :target: https://codecov.io/gh/python-pillow/Pillow
- :alt: Code coverage
-
-.. |zenodo| image:: https://zenodo.org/badge/17549/python-pillow/Pillow.svg
- :target: https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow
-
-.. |tidelift| image:: https://tidelift.com/badges/package/pypi/Pillow?style=flat
- :target: https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=badge
-
-.. |version| image:: https://img.shields.io/pypi/v/pillow.svg
- :target: https://pypi.org/project/Pillow/
- :alt: Latest PyPI version
-
-.. |downloads| image:: https://img.shields.io/pypi/dm/pillow.svg
- :target: https://pypi.org/project/Pillow/
- :alt: Number of PyPI downloads
-
-.. |gitter| image:: https://badges.gitter.im/python-pillow/Pillow.svg
- :target: https://gitter.im/python-pillow/Pillow?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
- :alt: Join the chat at https://gitter.im/python-pillow/Pillow
-
-.. |twitter| image:: https://img.shields.io/badge/tweet-on%20Twitter-00aced.svg
- :target: https://twitter.com/PythonPillow
- :alt: Follow on https://twitter.com/PythonPillow
diff --git a/setup.py b/setup.py
index cc27684316b..c85667f605f 100755
--- a/setup.py
+++ b/setup.py
@@ -243,11 +243,6 @@ def _cmd_exists(cmd):
)
-def _read(file):
- with open(file, "rb") as fp:
- return fp.read()
-
-
def _pkg_config(name):
try:
command = os.environ.get("PKG_CONFIG", "pkg-config")
@@ -858,12 +853,17 @@ def debug_build():
Extension("PIL._imagingmath", ["src/_imagingmath.c"]),
Extension("PIL._imagingmorph", ["src/_imagingmorph.c"]),
]
+
+with open("README.md") as f:
+ long_description = f.read()
+
try:
setup(
name=NAME,
version=PILLOW_VERSION,
description="Python Imaging Library (Fork)",
- long_description=_read("README.rst").decode("utf-8"),
+ long_description=long_description,
+ long_description_content_type="text/markdown",
license="HPND",
author="Alex Clark (PIL Fork Author)",
author_email="aclark@python-pillow.org",