Merge pull request #113 from toabctl/drop-setuptools-markdown

4 files changed, 5 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index f78f32d..56e4751 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ virt: lxd
 language: python
 matrix:
   include:
-  - python: 3.6
-    env: TOX_ENV=py36
   - python: 3.7
     env: TOX_ENV=py37
   - python: 3.8
diff --git a/INSTALL.md b/INSTALL.md
index 3d67108..935e4d8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -11,9 +11,8 @@ Before you pick an option, it is very important to consider that [only
 certain combinations of libgit2 and pygit2 will work
 together](http://www.pygit2.org/install.html#version-numbers).
 
-Also, Python 2.x is no longer supported for `git-deps`, although as of
-April 2021 it may still work if you are lucky and know what you are
-doing.
+Also, Python < 3.7 is no longer supported for `git-deps` (since pygit2
+requires 3.7 or higher).
 
 ## Option 0 (easiest): let `pip` take care of everything
 
diff --git a/setup.py b/setup.py
index 4b84cc1..6f11ee4 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,9 @@ def setup_package():
         setup_requires=[
             'six',
             'pyscaffold>=2.5.10,<2.6a0',
-            'setuptools-markdown',
         ] + sphinx,
-        long_description_markdown_filename='README.md',
+        long_description='README.md',
+        long_description_content_type="text/markdown",
         use_pyscaffold=True
     )
 
diff --git a/tox.ini b/tox.ini
index 603568e..89f5094 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@
 
 [tox]
 minversion = 1.8
-envlist = py36,py37,py38,flake8
+envlist = py37,py38,flake8
 skip_missing_interpreters = True
 
 [testenv]