Skip to content

Commit

Permalink
Merge pull request #24 from mocco/frecar/frigg
Browse files Browse the repository at this point in the history
Install Frigg
  • Loading branch information
frecar committed Jul 18, 2015
2 parents 2853e11 + 07cec5f commit eb258a2
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 24 deletions.
13 changes: 13 additions & 0 deletions .frigg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
tasks:
- tox -e flake8
- tox -e isort
- tox -e tests
- coverage report --fail-under=35
- coverage xml

verbose_tasks:
- coverage report --fail-under=35

coverage:
path: coverage.xml
parser: python
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

13 changes: 6 additions & 7 deletions django_fabric/base.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# -*- coding: utf-8 -*-
import time
import django

from fabric.context_managers import settings, quiet
import django
import requests
from fabric import colors
from fabric.api import cd, local, run
from fabric.context_managers import quiet, settings
from fabric.contrib import django as fab_django
from fabric.contrib.console import confirm
from fabric.contrib.files import exists
from fabric.api import local, run, cd
from fabric.operations import get
from fabric.contrib import django as fab_django
from fabric.utils import abort
from fabric import colors

import requests

STATIC_FILES = 'django.contrib.staticfiles'

Expand Down
2 changes: 1 addition & 1 deletion django_fabric/mixins.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import os

from fabric.api import cd
from fabric import colors
from fabric.api import cd
from fabric.contrib.console import confirm


Expand Down
5 changes: 3 additions & 2 deletions django_fabric/notifications.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# -*- coding: utf8 -*-
import re
import json
import time
import re
import socket
import time

import requests
from fabric import colors

Expand Down
9 changes: 9 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[flake8]
max_line_length=100
exclude=*/__init__.py,docs/conf.py,./tests/run.py

[isort]
line_length=100
skip=.tox,frigg/settings/__init__.py
default_section=THIRDPARTY
known_first_party=django_fabric
26 changes: 23 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
[flake8]
max-line-length=100
exclude=*/__init__.py,docs/conf.py,./tests/run.py
[tox]
envlist = tests,isort,flake8
skipsdist = True

[testenv]
basepython = python2.7
deps =
isort: isort
flake8: flake8
commands =
isort: isort -c -rc django_fabric
flake8: flake8

[testenv:tests]
deps = fabric
django
requests
coverage
setenv =
DJANGO_SETTINGS_MODULE='tests.django_settings'
commands =
python setup.py test
coverage run --source=django_fabric {toxinidir}/setup.py test

0 comments on commit eb258a2

Please sign in to comment.