8000 Merge pull request #592 from prometheus/superq/circleci · rwky/client_python@f81891f · GitHub
[go: up one dir, main page]
Skip to content

Commit f81891f

Browse files
SuperQSuperQ
authored
Merge pull request prometheus#592 from prometheus/superq/circleci
Convert CI to CircleCI
2 parents 9df3bd1 + b939b06 commit f81891f

File tree

4 files changed

+97
-82
lines changed

4 files changed

+97
-82
lines changed

‎.circleci/config.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
---
2+
version: 2.1
3+
4+
executors:
5+
python:
6+
docker:
7+
- image: cimg/python:3.9
8+
9+
jobs:
10+
flake8_lint:
11+
executor: python
12+
steps:
13+
- checkout
14+
- run: pip install tox
15+
- run: tox -e flake8
16+
isort_lint:
17+
executor: python
18+
steps:
19+
- checkout
20+
- run: pip install tox
21+
- run: tox -e isort
22+
test:
23+
parameters:
24+
python:
25+
type: string
26+
docker:
27+
- image: circleci/python:<< parameters.python >>
28+
environment:
29+
TOXENV: "py<< parameters.python >>"
30+
steps:
31+
- checkout
32+
- run: echo 'export PATH=$HOME/.local/bin:$PATH' >> $BASH_ENV
33+
- run: pip install --user tox
34+
- run: tox
35+
test_nooptionals:
36+
parameters:
37+
python:
38+
type: string
39+
docker:
40+
- image: cimg/python:<< parameters.python >>
41+
environment:
42+
TOXENV: "py<< parameters.python >>-nooptionals"
43+
steps:
44+
- checkout
45+
- run: pip install tox
46+
- run: tox
47+
test_pypy:
48+
parameters:
49+
python:
50+
type: string
51+
docker:
52+
- image: pypy:<< parameters.python >>
53+
environment:
54+
TOXENV: "pypy<< parameters.python >>"
55+
steps:
56+
- checkout
57+
- run: pip install tox
58+
- run: tox
59+
60+
61+
workflows:
62+
version: 2
63+
client_python:
64+
jobs:
65+
- flake8_lint
66+
- isort_lint
67+
- test:
68+
matrix:
69+
parameters:
70+
python:
71+
- "2.7"
72+
- "3.4"
73+
- "3.5"
74+
- "3.6"
75+
- "3.7"
76+
- "3.8"
77+
- "3.9"
78+
- test_nooptionals:
79+
matrix:
80+
parameters:
81+
python:
82+
- "2.7"
83+
- "3.9"
84+
- test_pypy:
85+
matrix:
86+
parameters:
87+
python:
88+
- "2.7"
89+
- "3.7"

‎.travis.yml

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

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@
3131
'twisted': ['twisted'],
3232
},
3333
test_suite="tests",
34-
python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
34+
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
3535
classifiers=[
3636
"Development Status :: 4 - Beta",
3737
"Intended Audience :: Developers",
3838
"Intended Audience :: Information Technology",
3939
"Intended Audience :: System Administrators",
4040
"Programming Language : 6DB6 : Python",
4141
"Programming Language :: Python :: 2",
42-
"Programming Language :: Python :: 2.6",
4342
"Programming Language :: Python :: 2.7",
4443
"Programming Language :: Python :: 3",
4544
"Programming Language :: Python :: 3.4",

‎tox.ini

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
11
[tox]
2-
envlist = coverage-clean,py26,py27,py34,py35,py36,py37,py38,py39,pypy,pypy3,{py27,py39}-nooptionals,coverage-report,flake8,isort
2+
envlist = coverage-clean,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9,pypy2.7,pypy3.7,{py2.7,py3.9}-nooptionals,coverage-report,flake8,isort
33

44

55
[base]
66
deps =
77
coverage
88
pytest
99

10-
[testenv:py26]
11-
; Last pytest and py version supported on py26 .
12-
deps =
13-
unittest2
14-
py==1.4.31
15-
pytest==2.9.2
16-
coverage
17-
futures
18-
19-
[testenv:py27]
10+
[testenv:py2.7]
2011
deps =
2112
{[base]deps}
2213
futures
2314

24-
[testenv:pypy]
15+
[testenv:pypy2.7]
2516
deps =
2617
{[base]deps}
2718
futures
2819

2920
[testenv]
3021
deps =
3122
{[base]deps}
32-
{py27,py37,pypy,pypy3}: twisted
33-
{py37,pypy3}: asgiref
23+
{py2.7,py3.7,pypy2.7,pypy3.7}: twisted
24+
{py3.7,pypy3.7}: asgiref
3425
commands = coverage run --parallel -m pytest {posargs}
3526

3627
; Ensure test suite passes if no optional dependencies are present.
37-
[testenv:py27-nooptionals]
28+
[testenv:py2.7-nooptionals]
3829
deps =
3930
{[base]deps}
4031
futures
4132
commands = coverage run --parallel -m pytest {posargs}
4233

43-
[testenv:py39-nooptionals]
34+
[testenv:py3.9-nooptionals]
4435
commands = coverage run --parallel -m pytest {posargs}
4536

4637
[testenv:coverage-clean]

0 commit comments

Comments
 (0)
0