Skip to content

Commit

Permalink
Merge pull request #27 from jcollado/circleciv2
Browse files Browse the repository at this point in the history
CircleCI v2
  • Loading branch information
jcollado committed Mar 13, 2017
2 parents d41769f + 82eaf5e commit 63d98d6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
18 changes: 18 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 2
jobs:
build:
working_directory: ~/rabbithole
docker:
- image: python:3.6.0
steps:
- checkout
- restore_cache:
key: rabbithole-{{ .Branch }}
- run: apt update
- run: apt install -y gcc python-dev
- run: pip install tox
- run: tox
- save_cache:
key: rabbithole-{{ .Branch }}
paths:
- ~/rabbithole/.tox
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python
python: 3.5
python: 3.6
env:
- TOXENV=py35
- TOXENV=py36
- TOXENV=py27
- TOXENV=flake8
- TOXENV=mypy2
Expand Down
11 changes: 0 additions & 11 deletions circle.yml

This file was deleted.

4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[tox]
envlist = py{27,35}, flake8, mypy{2,3}
envlist = py{27,36}, flake8, mypy{2,3}

[testenv:py27]
deps = -r{toxinidir}/requirements/test_py2.txt

[testenv:py35]
[testenv:py36]
deps = -r{toxinidir}/requirements/test_py3.txt

[testenv:flake8]
Expand Down

0 comments on commit 63d98d6

Please sign in to comment.