Merge pull request #3 from acdha/packaging-updates

Packaging updates

Author: bennylope

.dockerignore

@@ -0,0 +1,2 @@
+.git
+.eggs

.editorconfig

@@ -0,0 +1,16 @@
+# See http://editorconfig.org for format details and
+# http://editorconfig.org/#download for editor / IDE integration
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+# Makefiles always use tabs for indentation
+[Makefile]
+indent_style = tab

Dockerfile

@@ -1,8 +1,8 @@
 # Run this exposing the directory of your choice as the /code volume:
 # docker run -i --rm --volume "$(pwd)":/code flake8-codeclimate > codeclimate.json
 
-FROM pypi/flake8
-MAINTAINER cadams@loc.gov
+FROM python:slim
+LABEL maintainer="cadams@loc.gov"
 
 RUN pip install --upgrade pip
 RUN pip install flake8-codeclimate

Makefile

@@ -0,0 +1,9 @@
+GIT_VERSION := $(shell python setup.py --version)
+
+all: docker
+
+docker:
+	docker build -t flake8-codeclimate:latest .
+	@if [[ "${GIT_VERSION}" != *"+"* ]]; then \
+		docker tag flake8-codeclimate:latest flake8-codeclimate:${GIT_VERSION}; \
+	fi

flake8_codeclimate.py

@@ -7,13 +7,19 @@
 
 """
 
+import json
+
+from flake8.formatting import base
+from pkg_resources import DistributionNotFound, get_distribution
+
 __author__ = 'Ben Lopatin'
-__version__ = '0.1.0'
 __license__ = 'MIT'
 
-
-import json
-from flake8.formatting import base
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    # package is not installed
+    pass
 
 
 category_complexity = "Complexity"
@@ -72,6 +78,7 @@ def error_category(error):
 
 class JSONFormatter(base.BaseFormatter):
     """Formatter for Code Climate JSON reporting"""
+
     def format(self, error):
         return json.dumps({
             "type": "issue",

setup.cfg

@@ -1,2 +1,8 @@
 [bdist_wheel]
 universal = 1
+
+[pycodestyle]
+max-line-length=110
+
+[isort]
+default_section=THIRDPARTY

setup.py

@@ -1,4 +1,5 @@
 from __future__ import with_statement
+
 import setuptools
 
 requires = [
@@ -10,13 +11,16 @@
 setuptools.setup(
     name="flake8_codeclimate",
     license="MIT",
-    version="0.1.3",
+    use_scm_version=True,
     description="Code Climate reporting formatter plugin for Flake8",
     long_description=readme,
     author="Ben Lopatin",
     author_email="ben@benlopatin.com",
     url="https://github.com/bennylope/flake8-codeclimate",
     py_modules=['flake8_codeclimate'],
+        setup_requires=[
+        'setuptools_scm',
+    ],
     install_requires=requires,
     entry_points={
         'flake8.report': [