diff options
author | Adam Spiers <git@adamspiers.org> | 2022-06-21 09:52:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 09:52:39 +0100 |
commit | a894a846a4684d37f966a1c25acf727179fa0a60 (patch) | |
tree | a5f64c809a0eddac242131902512a0519c9eb643 | |
parent | 5dd7f4c4b6d4d771c5b6866b8256eb1bad632843 (diff) | |
parent | dd852df2b25413fe74e141f8e1f3c6a30724aad8 (diff) | |
download | git-deps-a894a846a4684d37f966a1c25acf727179fa0a60.tar.gz |
Merge pull request #113 from toabctl/drop-setuptools-markdown
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | INSTALL.md | 5 | ||||
-rw-r--r-- | setup.py | 4 | ||||
-rw-r--r-- | tox.ini | 2 |
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 @@ -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 @@ -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 ) @@ -3,7 +3,7 @@ [tox] minversion = 1.8 -envlist = py36,py37,py38,flake8 +envlist = py37,py38,flake8 skip_missing_interpreters = True [testenv] |