Skip to content

Commit

Permalink
updating install dependancies (#1)
Browse files Browse the repository at this point in the history
* updating install dependancies

* bumping minor version

* setup.py syntax

* typo

* moving mysql to tests_require in setup.py

* removing grpcio dependencies
  • Loading branch information
nucleardreamer authored Aug 21, 2018
1 parent 7d4a144 commit e0431ed
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "${workspaceFolder}/env/bin/python"
}
2 changes: 1 addition & 1 deletion Dockerfile.install
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FROM alpine:3.6
RUN apk add --no-cache python py-mysqldb py-pip libgcc
WORKDIR /kama
COPY wheels .
RUN pip install *.whl
RUN pip install pip --upgrade && pip install *.whl
21 changes: 17 additions & 4 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
FROM alpine:3.6
RUN apk add --no-cache bash python python-dev openssl-dev py-pip py-mysqldb alpine-sdk
RUN pip install pip --upgrade
RUN pip install grpcio
RUN pip install nose
RUN apk add --no-cache \
bash \
python \
python-dev \
openssl-dev \
py-pip \
py-mysqldb \
alpine-sdk

WORKDIR /kama

RUN pip install pip --upgrade

COPY requirements.txt .

RUN pip install -r requirements.txt \
&& pip install nose

COPY . .

RUN pip install .
14 changes: 8 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

setup(
name='kama',
version='1.2.5',
version='1.3.0',
description='A truth database',
url='https://kama.sh/',
author='Jeremy Grosser',
Expand All @@ -31,11 +31,13 @@
],
packages=['kama'],
install_requires=[
'grpcio==1.4.0',
# We don't explicitly depend on MySQL-python because it's only required on the
# server and we don't want to introduce an unnecessary dependency for clients
# importing the library
# 'MySQL-python==1.2.5',
'grpcio==1.14.1'
],
tests_require = [
# We don't explicitly depend on MySQL-python because it's only required on the
# server and in tests, and we don't want to introduce an unnecessary dependency for clients
# importing the library
'MySQL-python==1.2.5'
],
entry_points={
'console_scripts': [
Expand Down

0 comments on commit e0431ed

Please sign in to comment.