Skip to content

Commit 66a6701

Browse files
authored
Merge pull request #62 from fronzbot/gitlab
Add gitlab support, py3.7 checks. Also removes py34 tests
2 parents a8f9040 + 5bdfd6d commit 66a6701

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

.gitlab-ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
image: python
2+
3+
stages:
4+
- test
5+
6+
before_script:
7+
- curl -O https://bootstrap.pypa.io/get-pip.py
8+
- python get-pip.py
9+
- pip install tox
10+
11+
python35:
12+
image: python:3.5
13+
stage: test
14+
script: tox -e py35
15+
16+
python36:
17+
image: python:3.6
18+
stage: test
19+
script: tox -e py36
20+
21+
lint:
22+
image: python:3.6
23+
stage: test
24+
script: tox -e lint
25+

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
matrix:
22
fast_finish: true
33
include:
4-
- python: "3.4.2"
5-
env: TOXENV=py34
64
- python: "3.6"
75
env: TOXENV=lint
86
- python: "3.5"
@@ -13,6 +11,8 @@ matrix:
1311
env: TOXENV=py36
1412
- python: "3.6"
1513
env: TOXENV=build
14+
- python: "3.7-dev"
15+
env: TOXENV=py37
1616

1717
install: pip install -U tox coveralls
1818
language: python

0 commit comments

Comments
 (0)