From 4f9274a5cce1c631f597d694f8d6f65d2568b776 Mon Sep 17 00:00:00 2001 From: Biryuzovye Kleshni Date: Mon, 25 Jun 2018 07:50:32 +0000 Subject: [PATCH] More build system integration for WorkProver --- .travis.yml | 4 +++- setup.py | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6534ee9f..53c21777 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,6 @@ addons: install: - pip install -r requirements.txt - python setup.py install -script: pybitmessage -t +script: + - pybitmessage -t + - python setup.py test diff --git a/setup.py b/setup.py index 4438becb..33c6657a 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from src.version import softwareVersion EXTRAS_REQUIRE = { 'gir': ['pygobject'], 'notify2': ['notify2'], - 'pyopencl': ['pyopencl'], + 'pyopencl': ['numpy', 'pyopencl'], 'prctl': ['python_prctl'], # Named threads 'qrcode': ['qrcode'], 'sound;platform_system=="Windows"': ['winsound'] @@ -102,8 +102,9 @@ if __name__ == "__main__": package_dir={'pybitmessage': 'src'}, packages=packages, package_data={'': [ - 'bitmessageqt/*.ui', 'bitmsghash/*.cl', 'sslkeys/*.pem', - 'translations/*.ts', 'translations/*.qm', + 'bitmessageqt/*.ui', 'translations/*.ts', 'translations/*.qm', + 'bitmsghash/*.cl', 'workprover/*.cl', 'workprover/fastsolver/*', + 'sslkeys/*.pem', 'images/*.png', 'images/*.ico', 'images/*.icns' ]}, data_files=[