Skip to content

Commit

Permalink
Merge a0796ce into c7c5ccd
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Mar 15, 2018
2 parents c7c5ccd + a0796ce commit f0facbf
Show file tree
Hide file tree
Showing 29 changed files with 1,818 additions and 399 deletions.
14 changes: 9 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@ environment:
matrix:
- PYTHON_MAJOR: 2
PYTHON_MINOR: 7
- PYTHON_MAJOR: 3
PYTHON_MINOR: 3
- PYTHON_MAJOR: 3
PYTHON_MINOR: 4
- PYTHON_MAJOR: 3
PYTHON_MINOR: 5
- PYTHON_MAJOR: 3
PYTHON_MINOR: 6

cache:
- env
- .venv -> Makefile

install:
# Export build paths
# Add Make and Python to the PATH
- copy C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe
- set PATH=%PATH%;C:\MinGW\bin
- make --version
- set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%;%PATH%
- set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%\Scripts;%PATH%
# Install system dependencies
- pip install pipenv
- make doctor
# Install project dependencies
- make install

Expand Down
4 changes: 3 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[run]

branch = true

omit =
*/env/*
.venv/*
*/tests/*
26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
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_cache/
/.coverage
/.coverage.*
/htmlcov/
/xmlreport/
/pyunit.xml
/tmp/
*.tmp

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

# Sublime Text
*.sublime-workspace
Expand Down
6 changes: 0 additions & 6 deletions .pep8rc

This file was deleted.

8 changes: 8 additions & 0 deletions .pycodestyle.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[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 = E401,E402,E501,E711,E712
5 changes: 3 additions & 2 deletions .pep257 → .pydocstyle.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[pep257]
[pydocstyle]

# D211: No blank lines allowed before class docstring
add_select = D211
Expand All @@ -9,5 +9,6 @@ add_select = D211
# D103: Missing docstring in public function
# D104: Missing docstring in public package
# D105: Missing docstring in magic method
# D107: Missing docstring in __init__
# D202: No blank lines allowed after function docstring
add_ignore = D100,D101,D102,D103,D104,D105,D202
add_ignore = D100,D101,D102,D103,D104,D105,D107,D202

0 comments on commit f0facbf

Please sign in to comment.