- Added pyqt5 + pyqt-distutils + click-datetime via pip (non existent in PyPi) to solve xeroc#17

- Added 'package' make target to build executables

Author: svdev

.travis.yml

@@ -8,13 +8,9 @@ matrix:
     language: generic
     before_install:
     - python --version
-    - brew install python3
-    - alias python=python3
-    - python --version
+    - brew upgrade python
 install:
-  - python --version
-  - pip install click-datetime PyQt5 pyinstaller
-  - python setup.py install
+  - make install
 script:
   - echo "@TODO - Running tests..."
   - pyinstaller --distpath dist/$TRAVIS_OS_NAME app.spec

Makefile

@@ -12,11 +12,13 @@ clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
+pip:
+	pip install -r requirements.txt
 
 lint:
 	flake8 dexbot/
 
-build:
+build: pip
 	python3 setup.py build
 
 install: build
@@ -29,10 +31,14 @@ git:
 	git push --all
 	git push --tags
 
-check:
+check: pip
 	python3 setup.py check
 
-dist:
+package: build
+	pyinstaller app.spec
+	pyinstaller cli.spec
+
+dist: pip
 	python3 setup.py sdist upload -r pypi
 	python3 setup.py bdist_wheel upload
 

README.md

@@ -6,20 +6,22 @@ Trading Bot for the BitShares Decentralized Exchange
 ## Build status
 
 master:  
-[![Build Status](https://travis-ci.org/svdev/DEXBot.svg?branch=master)](https://travis-ci.org/svdev/DEXBot)
+[![Build Status](https://travis-ci.org/Codaone/DEXBot.svg?branch=master)](https://travis-ci.org/Codaone/DEXBot)
 
-develop:  
-[![Build Status](https://travis-ci.org/svdev/DEXBot.svg?branch=develop)](https://travis-ci.org/svdev/DEXBot)
 
 **Warning**: This is highly experimental code! Use at your OWN risk!
 
 ## Installation
 
-    git clone https://github.com/codaone/dexbot
-    cd dexbot
-    python3 setup.py install
-    # or
-    python3 setup.py install --user
+Python 3.4+ + pip are required.
+
+    $ git clone https://github.com/codaone/dexbot
+    $ cd dexbot    
+    $ make install    
+
+or
+    
+    $ make install-user
 
 ## Configuration
 

appveyor.yml

@@ -20,7 +20,7 @@ configuration: Release
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
-  - "pip install pyinstaller click-datetime PyQt5"
+  - "pip install pyinstaller click-datetime PyQt5 pyqt-distutils"
   - "python setup.py install"
 
 after_test:

requirements.txt

@@ -0,0 +1,4 @@
+pyqt5==5.10
+pyqt-distutils==0.7.3
+click-datetime==0.2
+pyinstaller==3.3.1

setup.py

@@ -52,11 +52,8 @@ def run(self):
         "bitshares==0.1.11.beta",
         "uptick>=0.1.4",
         "click",
-        "click-datetime",
         "sqlalchemy",
         "appdirs",
-        "pyqt5",
-        'pyqt-distutils',
         "ruamel.yaml"
     ],
     dependency_links=[