Skip to content

Commit 9111c6d

Browse files
committed
Remove 3.5 compat
1 parent 49db522 commit 9111c6d

13 files changed

+27
-22
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ __pycache__/
33
/build/
44
/dist/
55

6-
# Venvs
7-
/3.5
6+
# Testing
7+
/.tox/
8+
/.coverage
9+
.pytest_cache/
810

911
# Docs
1012
/docs/_build/
1113
/docs/scanpydoc.*.rst
1214

1315
# IDEs
1416
/.idea/
15-
/.coverage

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ dist: xenial
22
language: python
33
cache: pip
44
python:
5-
- '3.5'
65
- '3.6'
76
- '3.7'
87

98
install:
109
- pip install future-fstrings flit codecov
1110
- flit install --deps develop
1211
script:
13-
- if [[ $TRAVIS_PYTHON_VERSION != 3.5 ]]; then export BLACK_SWITCH=--black; fi
14-
- PYTHONPATH=. pytest --cov=scanpydoc $BLACK_SWITCH
12+
- PYTHONPATH=. pytest --cov=scanpydoc --black
1513
- rst2html.py --halt=2 README.rst >/dev/null
1614
after_success: codecov

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
import sys
32
from datetime import datetime
43
from pathlib import Path

docs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
get_version
2-
future-fstrings
32

43
sphinx>=1.8
54
sphinx-autodoc-typehints

pyproject.toml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ['flit>=1.3', 'future-fstrings']
2+
requires = ['flit>=1.3']
33
build-backend = 'flit.buildapi'
44

55
[tool.flit.metadata]
@@ -17,24 +17,37 @@ classifiers = [
1717
'Topic :: Software Development :: Libraries :: Python Modules',
1818
'Framework :: Sphinx :: Extension',
1919
]
20-
requires-python = '>=3.5'
20+
requires-python = '>=3.6'
2121
requires = [
2222
'sphinx>=1.8',
2323
'get_version',
24-
'future-fstrings',
2524
]
2625

2726
[tool.flit.metadata.requires-extra]
2827
test = [
2928
'pytest',
3029
'pytest-cov',
31-
'pytest-black; python_version != "3.5"',
30+
'pytest-black',
3231
'scipy', # to test overrides
3332
]
3433
doc = [
3534
'sphinx-autodoc-typehints>=1.7',
3635
]
3736

3837
[tool.black]
39-
py36 = false
40-
exclude = '3.5'
38+
target-version = ['py36']
39+
40+
[tool.tox]
41+
legacy_tox_ini = """
42+
[tox]
43+
envlist = py36,py37
44+
skipsdist = True
45+
46+
[testenv]
47+
deps =
48+
flit
49+
future-fstrings
50+
commands =
51+
flit install
52+
pytest
53+
"""

scanpydoc/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
"""A series of Sphinx extensions to get easy to maintain, numpydoc style documentation.
32
43
This module is also an extension itself which simply sets up all included extensions.

scanpydoc/autosummary_generate_imported.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
"""Generate autosummary docs for imported members.
32
43
This extension patches the :mod:`~sphinx.ext.autosummary` extension to generate docs for imported members.

scanpydoc/definition_list_typed_field.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
"""Prettier function parameter documentation.
32
43
This extension replaces the default :class:`~sphinx.domains.python.PyTypedField`

scanpydoc/elegant_typehints.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
"""Format typehints elegantly and and fix autimatically created links.
32
43
The Sphinx extension :mod:`sphinx_autodoc_typehints` adds type annotations to functions.

scanpydoc/rtd_github_links.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: future-fstrings -*-
21
"""GitHub URLs for class and method pages
32
43
This extension registers a :ref:`Jinja filter <jinja:filters>` called :func:`github_url`

0 commit comments

Comments
 (0)