Skip to content

Commit

Permalink
Merge pull request #177 from jacebrowning/release/v1.5
Browse files Browse the repository at this point in the history
Release v1.5
  • Loading branch information
jacebrowning authored Sep 8, 2018
2 parents cbeb731 + db75b9f commit c287074
Show file tree
Hide file tree
Showing 59 changed files with 1,973 additions and 561 deletions.
14 changes: 10 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@ environment:
matrix:
- PYTHON_MAJOR: 3
PYTHON_MINOR: 5
- PYTHON_MAJOR: 3
PYTHON_MINOR: 6
- PYTHON_MAJOR: 3
PYTHON_MINOR: 7

cache:
- env
- .venv -> Pipfile.lock

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
# Check system dependencies
- 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: 10 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ __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

# Google Drive
Expand All @@ -34,19 +33,14 @@ Icon*
*.gdraw

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

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

# Sublime Text
*.sublime-workspace
Expand Down
13 changes: 13 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[settings]

not_skip = __init__.py

multi_line_output = 5

known_third_party = click,log
known_first_party = demo

combine_as_imports = true
include_trailing_comma = true

lines_after_imports = 2
9 changes: 5 additions & 4 deletions .pycodestyle.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[pycodestyle]

# W504 line break after binary operator
# 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
# 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 = W504,E401,E402,E501,E711,E712
3 changes: 2 additions & 1 deletion .pydocstyle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit c287074

Please sign in to comment.