Relax python_version option to allow 3.x etc.

bosondata · Apr 17, 2017 · 9e91286 · 9e91286
1 parent 520948f
commit 9e91286
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,7 +43,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
     babel-eslint
 
 RUN pip2 install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
-    python3 -m pip install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
+    pip3 install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
     python3.6 -m pip install -U badwolf \
     && rm -rf /var/lib/apt/list/* /tmp/* /var/tmp/*
 

diff --git a/badwolf/lint/linters/__init__.py b/badwolf/lint/linters/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+
 import os
 import re
 import sys
@@ -76,8 +77,6 @@ class PythonLinter(Linter):
 
     @property
     def python_name(self):
-        python_version = int(self.options.get('python_version', sys.version_info.major))
-        if python_version not in (2, 3):
-            python_version = sys.version_info.major
-
+        current_python = '{}.{}'.format(sys.version_info.major, sys.version_info.minor)
+        python_version = self.options.get('python_version', current_python)
         return 'python{}'.format(python_version)
diff --git a/src.Dockerfile b/src.Dockerfile
@@ -47,7 +47,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
     babel-eslint
 
 RUN pip2 install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
-    python3 -m pip install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
+    pip3 install -U flake8 pep8 pep8-naming pylint flake8-import-order && \
     pip3 install -Ur requirements.txt \
     && python3.6 -m pip install . \
     && rm -rf /var/lib/apt/list/* /tmp/* /var/tmp/*