from setuptools import setup
import subprocess, os

version = open('pymoku/version.txt').read().strip()

setup(
	name='pymoku',
	version=version,
	author='Ben Nizette',
	author_email='ben.nizette@liquidinstruments.com',
	packages=['pymoku', 'pymoku.tools'],
	package_dir={'pymoku': 'pymoku/'},
	package_data={
		'pymoku' : ['version.txt', '*.capnp', 'bin/*']
	},
	license='MIT',
	long_description="Python scripting interface to the Liquid Instruments Moku:Lab",

	url="https://github.com/liquidinstruments/pymoku",
	download_url="https://github.com/liquidinstruments/pymoku/archive/%s.tar.gz" % version,

	keywords=['moku', 'liquid instruments', 'test', 'measurement', 'lab', 'equipment'],

	entry_points={
		'console_scripts' : [
			'moku=pymoku.tools.moku:main',
			'moku_convert=pymoku.tools.moku_convert:main',
		]
	},

	install_requires=[
		'future',
		'pyzmq>=15.3.0',
		'six',
		'urllib3',
		'pyzmq',
		'rfc6266',
		'requests',
	],

	zip_safe=False, # This isn't strictly true, but makes debugging easier on the device
)

from setuptools import setup
import subprocess, os

version = open('pymoku/version.txt').read().strip()

setup(
	name='pymoku',
	version=version,
	author='Ben Nizette',
	author_email='ben.nizette@liquidinstruments.com',
	packages=['pymoku'],
	package_dir={'pymoku': 'pymoku/'},
	package_data={
		'pymoku' : ['version.txt', '*.capnp', 'bin/*']
	},
	license='MIT',
	long_description="Python scripting interface to the Liquid Instruments Moku:Lab",

	url="https://github.com/liquidinstruments/pymoku",
	download_url="https://github.com/liquidinstruments/pymoku/archive/%s.tar.gz" % version,

	keywords=['moku', 'liquid instruments', 'test', 'measurement', 'lab', 'equipment'],

	entry_points={
		'console_scripts' : [
			'moku=pymoku.tools.moku:main',
			'moku_convert=pymoku.tools.moku_convert:main',
		]
	},

	install_requires=[
		'future',
		'pyzmq>=15.3.0',
		'six',
		'urllib3',
		'pyzmq',
		'rfc6266',
		'requests',
	],
)

--- 
+++ 
@@ -8,7 +8,7 @@
 	version=version,
 	author='Ben Nizette',
 	author_email='ben.nizette@liquidinstruments.com',
-	packages=['pymoku'],
+	packages=['pymoku', 'pymoku.tools'],
 	package_dir={'pymoku': 'pymoku/'},
 	package_data={
 		'pymoku' : ['version.txt', '*.capnp', 'bin/*']
@@ -37,4 +37,6 @@
 		'rfc6266',
 		'requests',
 	],
+
+	zip_safe=False, # This isn't strictly true, but makes debugging easier on the device
 )
HG-1871: Fix missing tools package install
