Merge pull request #44 from moshthepitt/cleanup

Cleanup

.pre-commit-config.yaml

@@ -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

requirements/dev.in

@@ -16,4 +16,6 @@ isort
 psycopg2-binary
 ipdb
 model_mommy
-black
+black
+pre-commit
+mypy

requirements/dev.txt

@@ -2,15 +2,18 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --upgrade requirements/dev.in
+#    pip-compile requirements/dev.in
 #
+
 appdirs==1.4.3            # via black
+aspy.yaml==1.3.0          # via pre-commit
 astroid==2.2.5            # via pylint
 attrs==19.1.0             # via black
 backcall==0.1.0           # via ipython
 backports.csv==1.0.7      # via tablib
 black==19.3b0
-certifi==2019.3.9         # via requests
+certifi==2019.6.16        # via requests
+cfgv==2.0.0               # via pre-commit
 chardet==3.0.4            # via requests
 click==7.0                # via black
 coverage==4.5.3
@@ -21,57 +24,68 @@ django-braces==1.13.0
 django-crispy-forms==1.7.2
 django-filter==2.1.0
 django-tables2==2.0.6
-django==2.2.1             # via django-allauth, django-filter, django-tables2, model-mommy
+django==2.2.3             # via django-allauth, django-filter, django-tables2, model-mommy
 entrypoints==0.3          # via flake8
 et-xmlfile==1.0.1         # via openpyxl
 filelock==3.0.12          # via tox
 flake8==3.7.7
+identify==1.4.5           # via pre-commit
 idna==2.8                 # via requests
-importlib-metadata==0.17  # via pluggy
+importlib-metadata==0.18  # via pluggy, pre-commit, tox
+importlib-resources==1.0.2  # via pre-commit
 ipdb==0.12
 ipython-genutils==0.2.0   # via traitlets
-ipython==7.5.0            # via ipdb
-isort==4.3.20
+ipython==7.6.1            # via ipdb
+isort==4.3.21
 jdcal==1.4.1              # via openpyxl
-jedi==0.13.3              # via ipython
+jedi==0.14.0              # via ipython
 lazy-object-proxy==1.4.1  # via astroid
 mccabe==0.6.1             # via flake8, pylint
 model-mommy==1.6.0
-oauthlib==3.0.1           # via requests-oauthlib
+mypy-extensions==0.4.1    # via mypy
+mypy==0.711
+nodeenv==1.3.3            # via pre-commit
+oauthlib==3.0.2           # via requests-oauthlib
 odfpy==1.4.0              # via tablib
 openpyxl==2.6.2           # via tablib
-parso==0.4.0              # via jedi
+packaging==19.0           # via tox
+parso==0.5.0              # via jedi
 pep8==1.7.1
 pexpect==4.7.0            # via ipython
 pickleshare==0.7.5        # via ipython
 pluggy==0.12.0            # via tox
+pre-commit==1.17.0
 prompt-toolkit==2.0.9     # via ipython
-psycopg2-binary==2.8.2
+psycopg2-binary==2.8.3
 ptyprocess==0.6.0         # via pexpect
 py==1.8.0                 # via tox
 pycodestyle==2.5.0        # via flake8
 pyflakes==2.1.1           # via flake8
 pygments==2.4.2           # via ipython
-pylint-django==2.0.9
+pylint-django==2.0.10
 pylint-plugin-utils==0.5  # via pylint-django
 pylint==2.3.1
+pyparsing==2.4.0          # via packaging
 python3-openid==3.1.0     # via django-allauth
 pytz==2019.1              # via django
-pyyaml==5.1               # via tablib
+pyyaml==5.1.1             # via aspy.yaml, pre-commit, tablib
 requests-oauthlib==1.2.0  # via django-allauth
 requests==2.22.0          # via django-allauth, requests-oauthlib
-six==1.12.0               # via astroid, model-mommy, prompt-toolkit, tox, traitlets
+six==1.12.0               # via astroid, cfgv, model-mommy, packaging, pre-commit, prompt-toolkit, tox, traitlets
 sqlparse==0.3.0           # via django
 tablib==0.13.0
-toml==0.10.0              # via black, tox
-tox==3.12.1
+toml==0.10.0              # via black, pre-commit, tox
+tox==3.13.2
 traitlets==4.3.2          # via ipython
-typed-ast==1.3.5          # via astroid
+typed-ast==1.4.0          # via astroid, mypy
 urllib3==1.25.3           # via requests
-virtualenv==16.6.0        # via tox
+virtualenv==16.6.1        # via pre-commit, tox
 wcwidth==0.1.7            # via prompt-toolkit
-wrapt==1.11.1             # via astroid
+wrapt==1.11.2             # via astroid
 xlrd==1.2.0               # via tablib
 xlwt==1.3.0               # via tablib
 yapf==0.27.0
-zipp==0.5.1               # via importlib-metadata
+zipp==0.5.2               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via ipdb, ipython

setup.cfg

@@ -3,3 +3,14 @@ default_section = THIRDPARTY
 known_first_party = vega_admin
 known_django = django
 sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRST_PARTY,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

vega_admin/__init__.py

@@ -1,7 +1,7 @@
 """
 Main init file for vega_admin
 """
-VERSION = (0, 0, 7)
-__version__ = '.'.join(str(v) for v in VERSION)
+VERSION = (0, 0, 9)
+__version__ = ".".join(str(v) for v in VERSION)
 # pylint: disable=invalid-name
-default_app_config = 'vega_admin.apps.VegaAdminConfig'  # noqa
+default_app_config = "vega_admin.apps.VegaAdminConfig"  # noqa