Skip to content

Commit

Permalink
Merge pull request #28 from moshthepitt/more-generic-emails
Browse files Browse the repository at this point in the history
More generic emails
  • Loading branch information
moshthepitt authored Jun 29, 2019
2 parents dd06630 + 0616034 commit 414c9af
Show file tree
Hide file tree
Showing 7 changed files with 218 additions and 59 deletions.
31 changes: 31 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.2.3
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: flake8

- repo: https://github.com/pre-commit/mirrors-isort
rev: v4.3.20
hooks:
- id: isort

- repo: https://github.com/python/black
rev: 19.3b0
hooks:
- id: black
language_version: python3.6

- repo: local
hooks:
- id: pylint
name: PyLint
entry: python -m pylint.__main__ --load-plugins pylint_django --rcfile=.pylintrc
language: system
files: \.py$

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.701
hooks:
- id: mypy
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ tblib = "*"
pylint-django = "*"
isort = "*"
"pep8" = "*"
pre-commit = "*"
mypy = "*"
103 changes: 93 additions & 10 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ Employees who are allowed overtime can log in and record overtime hours. This i

Admins can download overtime hours reports for a particular period.

## Contribution

All contributions are welcome.

To set up the project:

1. Clone this repo
2. `pipenv sync --dev`
3. `pre-commit install`

## Testing

```sh
Expand Down
14 changes: 13 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,16 @@
default_section = THIRDPARTY
known_first_party = small_small_hr
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRST_PARTY,LOCALFOLDER
known_tests = tests
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRST_PARTY,TESTS,LOCALFOLDER
multi_line_output = 3
include_trailing_comma = True
force_grid_wrap = 0
use_parentheses = True
line_length = 88

[flake8]
max-line-length=90

[pycodestyle]
max-line-length=90
6 changes: 3 additions & 3 deletions small_small_hr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Main init file for small_small_hr
"""
VERSION = (0, 1, 7)
__version__ = '.'.join(str(v) for v in VERSION)
VERSION = (0, 1, 8)
__version__ = ".".join(str(v) for v in VERSION)
# pylint: disable=invalid-name
default_app_config = 'small_small_hr.apps.SmallSmallHrConfig' # noqa
default_app_config = "small_small_hr.apps.SmallSmallHrConfig" # noqa
Loading

0 comments on commit 414c9af

Please sign in to comment.