8000 Merge pull request #117 from astrofrog/update-tests · astropy/sphinx-automodapi@9d296ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d296ba

Browse files
pllimpllim
authored
Merge pull request #117 from astrofrog/update-tests
Require Python 3.6 and update Azure configuration
2 parents cb8f5af + 3a3ba54 commit 9d296ba

File tree

5 files changed

+57
-84
lines changed

5 files changed

+57
-84
lines changed

‎CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Changes in sphinx-automodapi
77
- Fixed implementation of ``allowed-package-names`` option (which did
88
not work at all). [#111]
99

10+
- Update minimum required Python version to 3.6. [#117]
11+
1012
0.12 (2019-08-15)
1113
-----------------
1214

‎azure-pipelines.yml

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,50 @@ schedules:
66
- master
77
always: 'true'
88

9+
resources:
10+
repositories:
11+
- repository: OpenAstronomy
12+
type: github
13+
endpoint: astropy
14+
name: OpenAstronomy/azure-pipelines-templates
15+
ref: master
16+
917
jobs:
1018

11-
- template: azure-template.yml
19+
- template: run-tox-env.yml@OpenAstronomy
1220
parameters:
13-
name: Linux
14-
os: linux
1521

16-
- template: azure-template.yml
17-
parameters:
18-
name: MacOSX
19-
os: macosx
22+
coverage: codecov
2023

21-
- template: azure-template.yml
22-
parameters:
23-
name: Windows
24-
os: windows
24+
libraries:
25+
apt:
26+
- graphviz
27+
brew:
28+
- graphviz
29+
choco:
30+
- graphviz
31+
32+
envs:
33+
34+
# Linux builds - test all Sphinx versions
35+
- linux: py36-test-sphinx17
36+
- linux: py36-test-sphinx18
37+
- linux: py36-test-sphinx20
38+
- linux: py37-test-sphinx21
39+
- linux: py37-test-sphinx22
40+
- linux: py37-test-sphinx23
41+
- linux: py37-test-sphinx24
42+
- linux: py37-test-sphinx30
43+
- linux: py38-test-sphinx31
44+
- linux: py38-test-sphinx32-clocale
45+
- linux: py38-test-sphinxdev
46+
47+
# MacOS X - just the oldest, most recent stable, and dev
48+
- macosx: py36-test-sphinx17
49+
- macosx: py37-test-sphinx32-clocale
50+
- macosx: py38-test-sphinxdev
51+
52+
# Windows - just the oldest, most recent stable, and dev
53+
- windows: py36-test-sphinx17
54+
- windows: py37-test-sphinx32-clocale
55+
- windows: py38-test-sphinxdev

‎azure-template.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ classifiers =
1919
[options]
2020
zip_safe = False
2121
packages = find:
22+
python_requires = >=3.6
2223
install_requires =
2324
sphinx>=1.7
2425

‎tox.ini

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
[tox]
2-
envlist =
3-
py27-test
4-
py37-test
5-
py27-test-clocale
6-
py37-test-clocale
7-
py27-test-sphinx17
8-
py36-test-sphinx17
9-
py37-test-sphinx18
10-
py37-test-sphinx20
11-
py37-test-sphinxdev
2+
envlist = py{36,37,38}-test-sphinx{17,18,20,21,22,23,24,30,31,32,dev}{-clocale,}
123
requires = pip >= 18.0
134
setuptools >= 30.3.0
145

156
[testenv]
167
changedir = .tmp/{envname}
178
deps =
18-
sphinx17: sphinx==1.7.9
19-
sphinx18: sphinx==1.8.5
20-
sphinx20: sphinx==2.0.1
21-
sphinx21: sphinx==2.1.2
9+
sphinx17: sphinx==1.7.*
10+
sphinx18: sphinx==1.8.*
11+
sphinx20: sphinx==2.0.*
12+
sphinx21: sphinx==2.1.*
13+
sphinx22: sphinx==2.2.*
14+
sphinx23: sphinx==2.3.*
15+
sphinx24: sphinx==2.4.*
16+
sphinx30: sphinx==3.0.*
17+
sphinx31: sphinx==3.1.*
18+
sphinx32: sphinx==3.2.*
2219
sphinxdev: git+https://github.com/sphinx-doc/sphinx.git
2320
extras =
2421
test: test
2522
commands =
26-
test: pytest --pyargs sphinx_automodapi --cov-append --cov sphinx_automodapi --cov-report=
23+
test: pytest --pyargs sphinx_automodapi
2724
setenv =
2825
clocale: LC_CTYPE=C
2926
clocale: LC_ALL=C

0 commit comments

Comments
 (0)
0