From 6fae7acf1120118bb1a5d02e5c5f254fd9b8702c Mon Sep 17 00:00:00 2001
From: Luke Robles <lukelrobles@gmail.com>
Date: Wed, 13 Jun 2018 10:46:33 -0700
Subject: [PATCH] Trying some new things with the gitlab.yml file, also
 removing pylint from requirements.txt so it is only instlled during testing

---
 .gitlab-ci.yml       | 14 ++++++--------
 Dockerfile-test-env  |  1 +
 app/requirements.txt |  1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 235bd2c7..5a726381 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,22 +4,20 @@ services:
 
 before_script:
   - apk add --no-cache python3
-  - pip3 install -r app/requirements.txt
 
 stages:
-  - test
+  - linting
   - deploy
 
-linting_python:
-  stage: test
+linting:
+  stage: linting
+  before_script:
+    - pip3 install pylint
   script:
     - pylint -E app/*.py
-  only:
-    - /.*/
-  tags:
-    - docker
 
 build_and_push_container:
+    - pip3 install -r app/requirements.txt
   stage: deploy
   script:
     - docker login -u ldooks -p $DOCKER_PASSWORD
diff --git a/Dockerfile-test-env b/Dockerfile-test-env
index 48408c6c..f3cc7527 100644
--- a/Dockerfile-test-env
+++ b/Dockerfile-test-env
@@ -3,6 +3,7 @@ ADD app/requirements.txt /requirements.txt
 RUN apk update && \
 	apk add --no-cache vim docker && \
 	pip install -U pip && \
+	pip install pylint && \
 	pip install -r requirements.txt
 
 ADD app /app
diff --git a/app/requirements.txt b/app/requirements.txt
index 5648ee1b..ec1efc85 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -2,7 +2,6 @@ beautifulsoup4
 discord.py
 docker
 gTTS
-pylint
 pyowm
 requests
 wikipedia