Skip to content

Commit

Permalink
Merge pull request #785 from joke2k/circleci-20
Browse files Browse the repository at this point in the history
migrate to circleci 2.0
  • Loading branch information
fcurella committed Jul 13, 2018
2 parents 026427a + c40b8f8 commit a0d707f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
12 changes: 12 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,12 @@
version: 2

jobs:
build:
docker:
- image: circleci/python:latest-node-browsers
steps:
- checkout
- run: pip install --user virtualenv
- run: virtualenv faker
- run: source faker/bin/activate && pip install tox
- run: source faker/bin/activate && tox
16 changes: 8 additions & 8 deletions appveyor.yml
Expand Up @@ -8,10 +8,6 @@ environment:
PYTHON_VERSION: "2.7.x"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python34"
PYTHON_VERSION: "3.4.x"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.x"
PYTHON_ARCH: "32"
Expand All @@ -20,14 +16,14 @@ environment:
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python37"
PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.x"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python34-x64"
PYTHON_VERSION: "3.4.x"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.x"
PYTHON_ARCH: "64"
Expand All @@ -36,6 +32,10 @@ environment:
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "64"

init:
- "ECHO %PYTHON%"
- ps: "ls C:/Python*"
Expand Down
3 changes: 0 additions & 3 deletions circle.yml

This file was deleted.

2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist=py{27,344,350,36,py250,py3240}
envlist=py{27,35,36,37,py250,py3240}
skip_missing_interpreters = true

[testenv]
Expand Down

0 comments on commit a0d707f

Please sign in to comment.