Merge branch 'develop' into 'feature/history'

# Conflicts:
#   requirements.txt

.gitlab-ci.yml

@@ -13,10 +13,20 @@ gemnasium-python-dependency_scanning:
 
 stages:
   - test
+  - deploy
 
 test:
   stage: test
   script:
     - apt-get update -qy
     - apt-get install -y python3-dev python3-pip build-essential sqlite3
     - pip3 install -r requirements.txt
+
+deployToDev:
+  stage: deploy
+  script:
+    - deployToDev
+  tags:
+    - cp1
+  only:
+    - develop

README.md

@@ -2,22 +2,36 @@
 
 The project is a web based implementation of couch potato.
 
+## Requirements
+- Python 3
+- Virtualenv
+- GCC
+- Git
+- MongoDB
+- SQLite
+
+### Ubuntu 18+
+```bash
+sudo apt-get update
+sudo apt-get install python3 python3-venv python3-dev build-essential git mongodb libmysqlclient-dev -y
+```
+
 ## Installation
 
-```bash 
+```bash
 cd python-cp-gui
 python3 -m venv env
 source env/bin/activate
 pip3 install -r requirements.txt
+# Configure config-bos-mint.yaml
+cd couchpotato
+cp example-config-bos-mint.yaml config-bos-mint.yaml
 ```
 
-
-
 ### First Run
 
-Modify config-bos-mint.yaml
-
 ```bash
+cd python-cp-gui
 source env/bin/activate
 cd couchpotato/scripts/
 ./install.sh
@@ -26,7 +40,9 @@ cd couchpotato/scripts/
 This operation will clear all the existing users
 
 ## Usage
+
 ```bash
+cd python-cp-gui
 source env/bin/activate
 cd couchpotato
 python3 manage.py runserver 0.0.0.0:9010

__version__

@@ -1 +1 @@
-0.2.0
+0.3.0

couchpotato/example-config-bos-mint.yaml

@@ -0,0 +1,37 @@
+debug: FALSE
+project_name: PYTHON COUCH POTATO
+project_sub_name: The Python Couch Potato project
+secret_key: THINK CLOCK SMOG FLAG SMACK TINKER FLUNK # enter any random string
+advanced_features: True
+
+sql_database: "sqlite:///{cwd}/bookied-local.db"
+
+connection:
+    use: hercules # enter your desired chain
+
+    hercules:
+        node:
+          - wss://hercules.peerplays.download/api
+        nobroadcast: False
+        num_retries: 1
+
+allowed_assets:
+    - BTFUN
+    - PPY
+    - TEST
+    - BTF
+
+potatoNames:
+  - cpx
+  - cpy
+
+bosApis:
+  - http://hercules.peerplays.download:8010/trigger
+
+token:
+  - 1111111
+
+token_telegram: ''
+
+telegram_chat_ids:
+  - ''

couchpotato/uwsgi.ini

@@ -0,0 +1,9 @@
+[uwsgi]
+module = couchpotato.wsgi:application
+master = true
+callable = application
+processes = 5
+socket = /tmp/cp.sock
+chmod-socket = 666
+vacuum = true
+die-on-term = true