Merge pull request TensorPy#8 from TensorPy/update-requirements

mdmintz · web-flow · commit df5d7d87a111 · 2017-03-16T03:08:52.000-04:00
Update requirements
diff --git a/install.sh b/install.sh
@@ -8,12 +8,12 @@ value="$(uname)"
 if [ $value == "Linux" ]
 then
   echo "Initializing TensorFlow setup on a Linux machine..."
-  export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.0-cp34-cp34m-linux_x86_64.whl
+  export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl
   pip install --ignore-installed --upgrade $TF_BINARY_URL
 elif [ $value == "Darwin" ]
 then
   echo "Initializing TensorFlow setup on a MAC..."
-  export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.0-py2-none-any.whl
+  export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl
   pip install --ignore-installed --upgrade $TF_BINARY_URL
 else
   echo "Incompatible machine for TensorFlow. Exiting script..."
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-requests==2.11.1
+requests==2.13.0
 six==1.10.0
-Pillow==3.4.2
+Pillow==4.0.0
 BeautifulSoup==3.2.1
 -e .
diff --git a/setup.py b/setup.py
@@ -8,17 +8,17 @@
 
 setup(
     name='tensorpy',
-    version='1.0.11',
+    version='1.0.12',
     url='http://tensorpy.com',
     author='Michael Mintz',
     author_email='@mintzworld',
     maintainer='Michael Mintz',
     description='Image Classification with TensorFlow made easy!',
     license='The MIT License',
     install_requires=[
-        'requests==2.11.1',
+        'requests==2.13.0',
         'six==1.10.0',
-        'Pillow==3.4.2',
+        'Pillow==4.0.0',
         'BeautifulSoup==3.2.1',
     ],
     packages=['tensorpy'],
diff --git a/tensorpy/classify.py b/tensorpy/classify.py
@@ -92,13 +92,14 @@ def main():
                 pool.join()
             else:
                 # Single-threading the image classification work
+                min_w_h = settings.MIN_W_H  # Minimum size for classification
                 for image in image_list:
                     web_core.save_file_as(image, "temp_image.png")
                     image_base.convert_image_file_to_jpg(
                         "downloads_folder/temp_image.png")
                     width, height = image_base.get_image_file_dimensions(
                         "downloads_folder/temp_image.jpg")
-                    if width >= 50 and height >= 50:
+                    if width >= min_w_h and height >= min_w_h:
                         best_guess = classify_image.external_run(
                             "downloads_folder/temp_image.jpg")
                         if images_classified == 0:
@@ -117,7 +118,7 @@ def main():
 
             if images_classified == 0:
                 print("\nCould not find images to classify on the page! "
-                      "(Min size = %dx%d)" % (
+                      "(Min size = %dx%d pixels)" % (
                         settings.MIN_W_H, settings.MIN_W_H))
             print("")
         else:
