Merge branch 'master' of gitlab.com:ldooks/dragon-bot

This commit is contained in:
Luke Robles 2017-12-16 18:40:34 -08:00
commit d5f0cd41dc
4 changed files with 16 additions and 9 deletions

View File

@ -4,7 +4,7 @@ services:
before_script: before_script:
- apk add --no-cache python3 - apk add --no-cache python3
- pip3 install pylint requests discord.py docker pylint wolframalpha pyowm beautifulsoup4 yahoo-finance - pip3 install -r app/requirements.txt
stages: stages:
- test - test

View File

@ -1,8 +1,7 @@
FROM python:3.6.2-alpine3.6 FROM python:3.6.2-alpine3.6
LABEL name="Dragon Bot" ADD app/requirements.txt /requirements.txt
RUN apk update && \ RUN apk update && \
apk add --no-cache vim docker && \ apk add --no-cache docker && \
pip install requests discord.py docker pylint wolframalpha pyowm beautifulsoup4 yahoo-finance pip install -r requirements.txt
ADD app /app ADD app /app
CMD python /app/dragon-bot.py
CMD python app/dragon-bot.py

View File

@ -1,10 +1,10 @@
FROM python:3.6.2-alpine3.6 FROM python:3.6.2-alpine3.6
LABEL name="Dragon Bot Test environment" ADD app/requirements.txt /requirements.txt
RUN apk update && \ RUN apk update && \
apk add --no-cache vim docker && \ apk add --no-cache vim docker && \
pip install requests discord.py docker pylint wolframalpha pyowm beautifulsoup4 yahoo-finance pip install -r requirements.txt
ADD app /app
ADD app /app
RUN printf "\n\nTesting your python code for errors\n\n" && \ RUN printf "\n\nTesting your python code for errors\n\n" && \
pylint -E /app/*.py pylint -E /app/*.py

8
app/requirements.txt Normal file
View File

@ -0,0 +1,8 @@
beautifulsoup4
discord.py
docker
pylint
pyowm
requests
wolframalpha
yahoo-finance