Changes following revision

Author: alandmoore

Chapter16/ABQ_Data_Entry/cxsetup.py

@@ -3,11 +3,9 @@
 import os
 
 base = None
-include_files = [('abq_data_entry/images', 'images')]
 target_name = 'abq'
 if platform.system() == "Windows":
   base = "Win32GUI"
-  target_name = f'{target_name}.exe'
 
 shortcut_data = [
   # (Type, Folder, Name, ?, Target exe, arguments, description, hotkey, icon, icon index, show cmd, Working dir)
@@ -49,7 +47,7 @@
         'jupyter_client', 'jupyter_core', 'ipykernel',
         'ipython_genutils'
       ],
-      'include_files': include_files
+      'include_files': [('abq_data_entry/images', 'images')]
     },
     'bdist_msi': {
       # can be generated in powershell: "{"+[System.Guid]::NewGuid().ToString().ToUpper()+"}"

Chapter16/ABQ_Data_Entry/requirements.txt

@@ -1,4 +1,10 @@
+--index-url https://pypi.python.org/simple/
+
+# Runtime
 requests
 paramiko
 matplotlib
 psycopg2
+
+# For testing REST:
+flask

Chapter16/ABQ_Data_Entry/setup.py

@@ -2,12 +2,6 @@
 
 with open('README.rst', 'r') as fh:
   long_description = fh.read()
-with open('requirements.txt', 'r') as fh:
-  requirements = [
-    line.strip()
-    for line in fh.readlines()
-    if line.strip() and not line.startswith('#')
-  ]
 
 setup(
   name='ABQ_Data_Entry',
@@ -23,7 +17,9 @@
     'abq_data_entry.images',
     'abq_data_entry.test'
   ],
-  install_requires=requirements,
+  install_requires=[
+      'requests', 'paramiko', 'matplotlib', 'psycopg2'
+  ],
   python_requires='>=3.6',
   package_data={'abq_data_entry.images': ['*.png', '*.xbm']},
   entry_points={