Skip to content

Commit

Permalink
Merge c971cf5 into 934a5d6
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Mar 13, 2017
2 parents 934a5d6 + c971cf5 commit 47d1f37
Show file tree
Hide file tree
Showing 28 changed files with 824 additions and 216 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
@@ -1,5 +1,5 @@
[run]
branch = true
omit =
*/env/*
*/.venv/*
*/tests/*
26 changes: 13 additions & 13 deletions .gitignore
Expand Up @@ -8,17 +8,17 @@ __pycache__
Icon*

# Temporary virtual environment files
.cache
/env
/.cache/
/.venv/

# Temporary server files
.env
*.pid

# Generated documentation
/docs/gen
/docs/apidocs
/site
/docs/gen/
/docs/apidocs/
/site/
/*.html
/*.rst
/docs/*.png
Expand All @@ -30,19 +30,19 @@ Icon*
*.gdraw

# Testing and coverage results
.cache
.pytest
.coverage
.coverage.*
/htmlcov
/xmlreport
/.pytest/
/.coverage
/.coverage.*
/htmlcov/
/xmlreport/
/pyunit.xml
/tmp/
*.tmp

# Build and release directories
/build/
/dist/
*.spec
/build
/dist

# Sublime Text
*.sublime-workspace
Expand Down
5 changes: 3 additions & 2 deletions .pep8rc → .pycodestyle.ini
@@ -1,7 +1,8 @@
[pep8]
[pycodestyle]

# E401 multiple imports on one line (checked by PyLint)
# E402 module level import not at top of file (checked by PyLint)
# E501: line too long (checked by PyLint)
# E711: comparison to None (used to improve test style)
# E712: comparison to True (used to improve test style)
ignore = E402,E501,E711,E712
ignore = E401,E402,E501,E711,E712
2 changes: 1 addition & 1 deletion .pep257 → .pydocstyle
@@ -1,4 +1,4 @@
[pep257]
[pydocstyle]

# D211: No blank lines allowed before class docstring
add_select = D211
Expand Down

0 comments on commit 47d1f37

Please sign in to comment.