Skip to content

Commit

Permalink
Redis-py is now set to a fixed version to avoid problems
Browse files Browse the repository at this point in the history
  • Loading branch information
g0ulash committed Sep 13, 2019
1 parent 8b5084f commit 28f24db
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 47 deletions.
12 changes: 0 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,8 @@ FROM python:3.5-jessie
ADD ./ /sb/
WORKDIR /sb/

#ARG PASS

#RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories

#RUN apk add --update --no-cache ca-certificates gcc g++ curl openblas-dev@community

#RUN ln -s /usr/include/locale.h /usr/include/xlocale.h

RUN pip install --upgrade pip

#RUN pip install -r /sb/requirements.txt

#CMD python3 ./insert_admin.py --password ${PASS}

RUN pip install .

WORKDIR /sb/app/
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
redis:
image: "redis:4"
image: "redis:4.0.14"
mongo:
image: "mongo:3.4"
web:
Expand Down
2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 1d5cd20e41b3b05b34ae1e0d03cbaaeb
config: 36763df1f89c05b0c3d114368dbfab07
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.0.2',
VERSION: '1.0.3',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Complete RESTful API &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Complete RESTful API &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -1170,7 +1170,7 @@ <h2>Login API<a class="headerlink" href="#login-api" title="Permalink to this he
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/exp.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Experiment functions &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Experiment functions &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -364,7 +364,7 @@ <h1>Experiment functions<a class="headerlink" href="#experiment-functions" title
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Index &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Index &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -507,7 +507,7 @@ <h2 id="V">V</h2>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/http-routingtable.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>HTTP Routing Table &mdash; StreamingBandit 1.0.2 documentation</title>
<title>HTTP Routing Table &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -63,7 +63,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -304,7 +304,7 @@ <h1>HTTP Routing Table</h1>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Welcome to StreamingBandit’s documentation! &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Welcome to StreamingBandit’s documentation! &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -265,7 +265,7 @@ <h2>Authors<a class="headerlink" href="#authors" title="Permalink to this headli
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Installation &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Installation &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -317,7 +317,7 @@ <h3>Using StreamingBandit front-end<a class="headerlink" href="#using-streamingb
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/libs.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Documentation of the supplied Libraries &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Documentation of the supplied Libraries &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -985,7 +985,7 @@ <h2>Thompson Bayesian Linear Regression<a class="headerlink" href="#thompson-bay
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
Binary file modified docs/objects.inv
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/py-modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Python Module Index &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Python Module Index &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -59,7 +59,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -246,7 +246,7 @@ <h1>Python Module Index</h1>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
6 changes: 3 additions & 3 deletions docs/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Search &mdash; StreamingBandit 1.0.2 documentation</title>
<title>Search &mdash; StreamingBandit 1.0.3 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.2
1.0.3
</div>


Expand Down Expand Up @@ -194,7 +194,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1.0.2',
VERSION:'1.0.3',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '1.0.2'
version = '1.0.3'
# The full version, including alpha/beta/rc tags.
release = '1.0.2'
release = '1.0.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
3 changes: 2 additions & 1 deletion insert_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ def insert_admin():
f = open("app/config.cfg", 'r')
else:
f = open("./config.cfg", 'r')
settings = yaml.load(f)
settings = yaml.full_load(f)
settings = settings['docker']
mongo_client = MongoClient(settings['mongo_ip'], settings['mongo_port'])
mongo_db = mongo_client['userinfo']
userinfo = mongo_db['userinfo']
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import setup

setup(name='StreamingBandit',
version='1.0.2',
version='1.0.3',
description='Python application to setup and run streaming (contextual) bandit experiments.',
author='Nth-iteration',
author_email='[email protected]',
Expand All @@ -15,7 +15,7 @@
packages=[],
install_requires=[
'tornado',
'redis',
'redis==2.10.6',
'pyyaml',
'pymongo',
'numpy',
Expand Down

0 comments on commit 28f24db

Please sign in to comment.