Merged master

NaturalHistoryMuseum · Nov 12, 2016 · 35f19eb · 35f19eb
2 parents dc58462 + ce89093
commit 35f19eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/requirements.pip b/requirements.pip
@@ -1,10 +1,13 @@
-# TODO How to specify OpenCV? 'cv2>=2.4.8'
+# TODO How to specify OpenCV? 'cv2>=2.4.8',
 pathlib==1.0.1; python_version == '2.7'
 pylibdmtx==0.1.4
 pyzbar==0.1.2
 Pillow==3.4.2
 numpy==1.11.2
 
+# Packages required for distribution
+PyInstaller==3.1.1
+
 # Packages required for testing
 coveralls>=1.1
 nose>=1.3.4
diff --git a/setup.py b/setup.py
@@ -25,8 +25,9 @@
     'test_suite': 'gouda.tests',
     'scripts': ['gouda/scripts/{0}.py'.format(script) for script in SCRIPTS],
     'entry_points': {
-        'console_scripts':
-            ['{0}=gouda.scripts.{0}:main'.format(script) for script in SCRIPTS],
+        'console_scripts': [
+            '{0}=gouda.scripts.{0}:main'.format(script) for script in SCRIPTS
+        ],
     },
     'install_requires': [
         # TODO How to specify OpenCV? 'cv2>=2.4.8'