merge with master

3 files changed, 55 insertions, 20 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 464757f..2d71489 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ container_scanning:
   stage: test
   variables:
     FEATURE_RUBY_REPORT: 'false'
-    LM_PYTHON_VERSION: 2
+    LM_PYTHON_VERSION: 3
     LM_REPORT_VERSION: 1
   script:
     - docker info
@@ -58,13 +58,13 @@ QA:java-maven:
 QA:python-pip:
   extends: .QA
   variables:
+    LM_PYTHON_VERSION: 2
     QA_PROJECT: python-pip
     QA_REF: 04dce91b
 
 QA:python3-pip:
   extends: .QA
   variables:
-    LM_PYTHON_VERSION: 3
     QA_RESULTS: python3-pip-v1
     QA_PROJECT: python-pip
     QA_REF: 48e250a1
@@ -93,6 +93,20 @@ QA:go:
     - docker tag $SOURCE_IMAGE $TARGET_IMAGE
     - docker push $TARGET_IMAGE
 
+.docker_tag_python2:
+  image: docker:stable
+  stage: tag
+  script:
+    - docker info
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - export SOURCE_IMAGE=$TMP_IMAGE
+    - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
+    - docker pull $SOURCE_IMAGE
+    - echo "FROM $SOURCE_IMAGE" > Dockerfile.python2
+    - echo "ENV LM_PYTHON_VERSION 2.7" >> Dockerfile.python2
+    - docker build -t $TARGET_IMAGE -f Dockerfile.python2 .
+    - docker push $TARGET_IMAGE
+
 branch:
   extends: .docker_tag
   variables:
@@ -120,12 +134,29 @@ version:
   when: manual
   allow_failure: false
 
+version python2:
+  extends: .docker_tag_python2
+  before_script:
+    - export IMAGE_TAG=${CI_COMMIT_TAG/v/}-python2
+    - echo "Checking that $CI_COMMIT_TAG is last in the changelog"
+    - test "$(grep '^## v' CHANGELOG.md |head -n 1)" = "## $CI_COMMIT_TAG"
+  only:
+    - tags
+  when: manual
+  allow_failure: false
+
 .release:
   extends: .docker_tag
   stage: release
   only:
     - tags
 
+.release_python2:
+  extends: .docker_tag_python2
+  stage: release
+  only:
+    - tags
+
 major:
   extends: .release
   variables:
@@ -141,43 +172,43 @@ latest:
   extends: .release
 
 12-1-stable:
-  extends: .release
+  extends: .release_python2
 
 12-0-stable:
-  extends: .release
+  extends: .release_python2
 
 11-11-stable:
-  extends: .release
+  extends: .release_python2
 
 11-10-stable:
-  extends: .release
+  extends: .release_python2
 
 11-9-stable:
-  extends: .release
+  extends: .release_python2
 
 11-8-stable:
-  extends: .release
+  extends: .release_python2
 
 11-7-stable:
-  extends: .release
+  extends: .release_python2
 
 11-6-stable:
-  extends: .release
+  extends: .release_python2
 
 11-5-stable:
-  extends: .release
+  extends: .release_python2
 
 11-4-stable:
-  extends: .release
+  extends: .release_python2
 
 11-3-stable:
-  extends: .release
+  extends: .release_python2
 
 11-2-stable:
-  extends: .release
+  extends: .release_python2
 
 11-1-stable:
-  extends: .release
+  extends: .release_python2
 
 11-0-stable:
-  extends: .release
+  extends: .release_python2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5549dff..adcc0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # GitLab License management changelog
 
-## v1.6.0
+## 1.7.0
 
 - Convert HTML to JSON transformation to generating a JSON report directly.
 
+## v1.6.0
+
+- Make Python 3.5 the default. (!56)
+
 ## v1.5.0
 
 - Reverts 1.4.0
diff --git a/Dockerfile b/Dockerfile
index 447c3a4..aea5817 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,9 +43,9 @@ RUN pip3 install --disable-pip-version-check setuptools==$SETUPTOOLS_VERSION &&
     mkdir $LOCAL_PYPI_INDEX && \
     wget -q -O $LOCAL_PYPI_INDEX/pip-$VERSION_OF_PIP.tar.gz https://files.pythonhosted.org/packages/93/ab/f86b61bef7ab14909bd7ec3cd2178feb0a1c86d451bc9bccd5a1aedcde5f/pip-$VERSION_OF_PIP.tar.gz
 
-# Version of Python, defaults to Python 2.7
-ARG LM_PYTHON_VERSION
-ENV LM_PYTHON_VERSION ${LM_PYTHON_VERSION:-2.7}
+# Version of Python, defaults to Python 3.5
+ARG LM_PYTHON_VERSION=3.5
+ENV LM_PYTHON_VERSION $LM_PYTHON_VERSION
 ENV LM_REPORT_VERSION ${LM_REPORT_VERSION:-1}
 
 COPY test /test