Skip to content

Commit

Permalink
Merge pull request #404 from jacebrowning/release/v1.6
Browse files Browse the repository at this point in the history
Release v1.6
  • Loading branch information
jacebrowning committed Aug 10, 2019
2 parents ae9a6af + 112d4a6 commit 0ea8351
Show file tree
Hide file tree
Showing 173 changed files with 5,738 additions and 3,319 deletions.
17 changes: 17 additions & 0 deletions .coveragerc
Expand Up @@ -5,3 +5,20 @@ branch = true
omit =
.venv/*
*/tests/*
*/__main__.py

[report]

omit =
*/gui/main.py
*/gui/application.py
*/gui/utilTkinter.py
*/gui/widget.py

exclude_lines =
pragma: no cover
raise NotImplementedError
except DistributionNotFound
if __name__ == '__main__'

skip_covered = true
3 changes: 2 additions & 1 deletion .editorconfig
Expand Up @@ -21,5 +21,6 @@ indent_size = 4
[*.yml]
indent_style = space

[makefile]
[Makefile]
indent_style = tab
indent_size = 4
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -3,12 +3,13 @@
*.egg-info
__pycache__
.ipynb_checkpoints
setup.py

# Temporary OS files
Icon*

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

# Temporary server files
Expand All @@ -20,7 +21,6 @@ Icon*
/docs/apidocs/
/site/
/*.html
/*.rst
/docs/*.png

# Google Drive
Expand All @@ -42,6 +42,7 @@ Icon*
/build/
/dist/
*.spec
**/MathJax

# Sublime Text
*.sublime-workspace
Expand Down
9 changes: 9 additions & 0 deletions .isort.cfg
@@ -0,0 +1,9 @@
[settings]
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
use_parentheses=True
line_length=88

known_first_party = doorstop
known_third_party = bottle,openpyxl
7 changes: 7 additions & 0 deletions .mypy.ini
@@ -0,0 +1,7 @@
[mypy]

ignore_missing_imports = true
no_implicit_optional = true
check_untyped_defs = true

cache_dir = .cache/mypy/
9 changes: 0 additions & 9 deletions .pycodestyle.ini

This file was deleted.

5 changes: 4 additions & 1 deletion .pylint.ini
Expand Up @@ -124,6 +124,9 @@ disable=
logging-format-interpolation,
duplicate-code,
unpacking-non-sequence,
ungrouped-imports,
bad-continuation,
superfluous-parens,

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down Expand Up @@ -267,7 +270,7 @@ indent-after-paren=4
indent-string=' '

# Maximum number of characters on a single line.
max-line-length=79
max-line-length=88

# Maximum number of lines in a module
max-module-lines=1000
Expand Down
21 changes: 8 additions & 13 deletions .travis.yml
@@ -1,28 +1,23 @@
dist: xenial

language: python
python:
- 3.4
- 3.5
- 3.6
matrix:
include:
- python: 3.7
dist: xenial
sudo: true
- 3.7

cache:
pip: true
directories:
- .venv
- ${VIRTUAL_ENV}

env:
global:
- RANDOM_SEED=0
- PIPENV_NOSPIN=true
# Encrypted GH_TOKEN token: http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci
- secure: JfVl6zxzhRIEG1VvLqMEPMGOecrzDyb2U0HPyQ4Z4pfKJgFJOdQ1orT9Aztpfr4edXqbCZnEy4WH8+FLBQagkXjT3Ladopv+9j1IkP8v1Gu1O8H2tHQc7wfGxnkQF+h0pFFS6adNAsMliQ5dxTojFYVoWebvZQbiVGYkew+QZ0c=

before_install:
- pip install pipenv
- curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
- source $HOME/.poetry/env
- make doctor

install:
Expand All @@ -35,7 +30,7 @@ script:

after_script: >
echo $TRAVIS_BRANCH; echo $TRAVIS_PULL_REQUEST; echo $TRAVIS_PYTHON_VERSION;
if [[ $TRAVIS_BRANCH == 'develop' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.3' ]]; then
if [[ $TRAVIS_BRANCH == 'develop' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.7' ]]; then
# Generate Doorstop HTML pages
make reqs ;
Expand Down Expand Up @@ -66,4 +61,4 @@ after_success:
notifications:
email:
on_success: never
on_failure: change
on_failure: never
17 changes: 5 additions & 12 deletions .verchew.ini
Expand Up @@ -6,24 +6,17 @@ version = GNU Make
[Python]

cli = python
versions = Python 3.4. | Python 3.5. | Python 3.6. | Python 3.7.
versions = 3.5 || 3.6 || 3.7

[pipenv]
[Poetry]

cli = pipenv
versions = 2018.7.

[pandoc]

cli = pandoc
version = 1.
optional = true
message = This is only needed to generate the README for PyPI.
cli = poetry
version = 0.12

[Graphviz]

cli = dot
cli_version_arg = -V
version = 2.
version = 2
optional = true
message = This is only needed to generate UML diagrams for documentation.

0 comments on commit 0ea8351

Please sign in to comment.