From 970627fada7518c67a6fcc46a4a191eb1887ba71 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jul 2017 15:45:51 -0400 Subject: [PATCH 01/39] Simplify TensorPy Python 3 installation script --- python3_install.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/python3_install.sh b/python3_install.sh index 5cd5f40..4749bf2 100755 --- a/python3_install.sh +++ b/python3_install.sh @@ -5,18 +5,8 @@ pip3 install --upgrade pip echo "Installing TensorPy for Python 3:" pip3 install -r requirements.txt --upgrade python3 setup.py install -value="$(uname)" -if [ $value == "Linux" ] -then - echo "Initializing TensorFlow setup on a Linux machine..." - pip3 install --upgrade tensorflow -elif [ $value == "Darwin" ] -then - echo "Initializing TensorFlow setup on a MAC..." - pip3 install --upgrade tensorflow -else - echo "Incompatible machine for TensorFlow. Exiting script..." -fi +echo "Installing TensorFlow..." +pip3 install --upgrade tensorflow echo "Downloading ImageNet Inception DB (for classifying images)..." python3 tensorpy/download_imagenet.py exit From b0adcddfd559ab22d16deaca429be71f60bb383b Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Thu, 3 Aug 2017 15:47:23 -0400 Subject: [PATCH 02/39] Update ReadMe files --- README.md | 4 +++- help_docs/how_tensorpy_works.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 62d089b..4292d20 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ (**[Watch the 2-minute tutorial on YouTube](https://www.youtube.com/watch?v=lVtzaHcUE7Q)**) -Now runs **much faster** since video released! +(**Upgraded** since that video was released!) You can use TensorPy to classify images by simply passing a URL on the command line, or by using TensorPy in your Python programs. **[TensorFlow](https://www.tensorflow.org/)** does all the real work. TensorPy also simplifies TensorFlow installation by automating several setup steps into a single script (See **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** and **[python3_install.sh](https://github.com/TensorPy/TensorPy/blob/master/python3_install.sh)** for details). @@ -47,6 +47,8 @@ For **Python 3** users, use **[python3_install.sh](https://github.com/TensorPy/T #### **Step 4:** Run the examples +(NOTE: Run times may vary depending on your Internet connection and computer's CPU speed.) + Classify a single image from a URL: ```bash diff --git a/help_docs/how_tensorpy_works.md b/help_docs/how_tensorpy_works.md index b01300e..0d76f96 100755 --- a/help_docs/how_tensorpy_works.md +++ b/help_docs/how_tensorpy_works.md @@ -1,5 +1,7 @@ ### How TensorPy Works (Detailed Explanation) +(NOTE: Run times may vary depending on your Internet connection and computer's CPU speed.) + Once TensorPy is installed with **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)**, a command called ``classify`` is added to your command line, which takes a URL as input. When called, TensorPy determines if that URL links to an image or a web image. If it's an image, TensorPy downloads the image to a new folder called ``downloads_folder``. From there, the image is converted to a JPEG. Then, the image is fed to the local **[tensorpy/classify_image.py](https://github.com/TensorPy/TensorPy/blob/master/tensorpy/classify_image.py)** which tells TensorFlow to use the ImageNet Inception database to classify the image and print out the result. If the ``classify`` command is called with a web page as input, then all images on that page (up to the limit defined in **[tensorpy/settings.py](https://github.com/TensorPy/TensorPy/blob/master/tensorpy/settings.py)**) will get downloaded to ``downloads_folder``, where TensorPy does the work listed above per image, with the exception of images smaller than the minimum size defined in tensorpy/settings.py (currently 50x50 pixels). Images that are too small will be skipped because results have shown that icons and other tiny images get extremely poor classification results. From c2a07e717b3532413a153ef6cf805fd29df18d62 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Mon, 1 Jan 2018 01:56:43 -0500 Subject: [PATCH 03/39] Welcome to 2018 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3ed9a1a..107c651 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Michael Mintz +Copyright (c) 2018 Michael Mintz Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6c3a9dcf26ec46d6942c464dadd3397144ac159e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 4 Feb 2018 16:40:11 -0500 Subject: [PATCH 04/39] Use "python setup.py develop" instead of "install" --- install.sh | 2 +- python3_install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 6fd187b..fa1a62c 100755 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ pip install --upgrade pip echo "Installing TensorPy for Python 2.7:" pip install -r requirements.txt --upgrade -python setup.py install +python setup.py develop value="$(uname)" if [ $value == "Linux" ] then diff --git a/python3_install.sh b/python3_install.sh index 4749bf2..b409877 100755 --- a/python3_install.sh +++ b/python3_install.sh @@ -4,7 +4,7 @@ pip3 install --upgrade pip echo "Installing TensorPy for Python 3:" pip3 install -r requirements.txt --upgrade -python3 setup.py install +python3 setup.py develop echo "Installing TensorFlow..." pip3 install --upgrade tensorflow echo "Downloading ImageNet Inception DB (for classifying images)..." From 5d6367126a501d6cba29e8e70b98cabe0f6d2d4f Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 4 Feb 2018 16:40:20 -0500 Subject: [PATCH 05/39] Update the ReadMe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4292d20..84e946d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![](http://cdn2.hubspot.net/hubfs/100006/images/tensorpy_logo_4_p.png "TensorPy") # TensorPy -[![pypi](https://img.shields.io/pypi/v/tensorpy.svg)](https://pypi.python.org/pypi/tensorpy) [![Python version](https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg "Python version")](https://docs.python.org/2/) [![MIT License](http://img.shields.io/badge/license-MIT-22BBCC.svg "MIT License")](https://github.com/TensorPy/TensorPy/blob/master/LICENSE) [![Join the chat at https://gitter.im/TensorPy/Lobby](https://badges.gitter.im/TensorPy/TensorPy.svg)](https://gitter.im/TensorPy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GitHub stars](https://img.shields.io/github/stars/TensorPy/TensorPy.svg "GitHub stars")](https://github.com/TensorPy/TensorPy/stargazers) +[![pypi](https://img.shields.io/pypi/v/tensorpy.svg)](https://pypi.python.org/pypi/tensorpy) [![Python version](https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg "Python version")](https://docs.python.org/2/) [![Join the chat at https://gitter.im/TensorPy/Lobby](https://badges.gitter.im/TensorPy/TensorPy.svg)](https://gitter.im/TensorPy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) **Easy Image Classification with TensorFlow** From 2d99530244159f156b807b6369c3405ba187451e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 15:45:50 -0400 Subject: [PATCH 06/39] Update Dockerfile --- Dockerfile | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3514060..6ad5690 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,50 +1,42 @@ # TensorPy Docker Image -FROM ubuntu:15.10 +FROM ubuntu:17.10 -#======================================= -# Install Python and Basic Python Tools -#======================================= -RUN apt-get update && apt-get install -y python python-pip python-setuptools \ - python-dev python-distribute python-virtualenv +#================================ +# Update apt-get package sources +#================================ +RUN apt-get update -#========================================= -# Install Bash Command Line Tools and Git -#========================================= +#================================================== +# Install Bash Command Line Tools, Python, and Git +#================================================== RUN apt-get -qy --no-install-recommends install \ + python \ + python-dev \ + python-pip \ + python-distribute \ + python-virtualenv \ + python-setuptools \ sudo \ unzip \ wget \ curl \ + libxi6 \ + libgconf-2-4 \ vim \ git-core \ && rm -rf /var/lib/apt/lists/* -#======================================== -# Add normal user with passwordless sudo -#======================================== -RUN sudo useradd seluser --shell /bin/bash --create-home \ - && sudo usermod -a -G sudo seluser \ - && echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers - -#============================== -# Locale and encoding settings -#============================== -ENV LANGUAGE en_US.UTF-8 -ENV LANG ${LANGUAGE} -RUN locale-gen ${LANGUAGE} \ - && dpkg-reconfigure --frontend noninteractive locales - #============================== # Set up TensorFlow / TensorPy #============================== -COPY third_party/docker/docker_install.sh /TensorPy/docker_install.sh +COPY install.sh /TensorPy/install.sh COPY requirements.txt /TensorPy/ COPY setup.py /TensorPy/ COPY tensorpy /TensorPy/tensorpy/ COPY examples /TensorPy/examples/ COPY third_party/docker /TensorPy/third_party/docker/ COPY third_party/docker/run_docker_test.sh /TensorPy/ -RUN cd /TensorPy && ls && ./third_party/docker/docker_install.sh +RUN cd /TensorPy && ls && ./install.sh RUN cd /TensorPy && pip install -r requirements.txt #=================== From f2d35a1a3e2402abaa246e40101cf98cdf26308e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 15:50:16 -0400 Subject: [PATCH 07/39] Update and simplify install script --- install.sh | 14 ++++++-------- python3_install.sh | 12 ------------ 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100755 python3_install.sh diff --git a/install.sh b/install.sh index fa1a62c..0676a09 100755 --- a/install.sh +++ b/install.sh @@ -1,21 +1,19 @@ # Installs TensorPy, TensorFlow, ImageNet, and required dependancies -# (Made for Python 2.7) -pip install --upgrade pip -echo "Installing TensorPy for Python 2.7:" +python -m pip install --upgrade pip +echo "Installing TensorPy:" pip install -r requirements.txt --upgrade python setup.py develop value="$(uname)" -if [ $value == "Linux" ] +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.2.1-cp27-none-linux_x86_64.whl + export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp27-none-linux_x86_64.whl pip install --ignore-installed --upgrade $TF_BINARY_URL -elif [ $value == "Darwin" ] +elif [ $value = "Darwin" ] then echo "Initializing TensorFlow setup on a MAC..." - export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.2.1-py2-none-any.whl - pip install --ignore-installed --upgrade $TF_BINARY_URL + pip install --upgrade tensorflow else echo "Incompatible machine for TensorFlow. Exiting script..." fi diff --git a/python3_install.sh b/python3_install.sh deleted file mode 100755 index b409877..0000000 --- a/python3_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -# Installs TensorPy, TensorFlow, ImageNet, and required dependancies -# (Made for Python 3) - -pip3 install --upgrade pip -echo "Installing TensorPy for Python 3:" -pip3 install -r requirements.txt --upgrade -python3 setup.py develop -echo "Installing TensorFlow..." -pip3 install --upgrade tensorflow -echo "Downloading ImageNet Inception DB (for classifying images)..." -python3 tensorpy/download_imagenet.py -exit From 84a7c2cf419e3fe040ab4dfcf77c6f4c4f015643 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 15:50:53 -0400 Subject: [PATCH 08/39] Update requirements --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index e5f2f52..afa93a6 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -requests==2.18.1 -six==1.10.0 +requests==2.19.1 +six==1.11.0 Pillow==4.1.1 BeautifulSoup4==4.6.0 -e . diff --git a/setup.py b/setup.py index 5f767cf..bc156a8 100644 --- a/setup.py +++ b/setup.py @@ -16,8 +16,8 @@ description='Easy Image Classification with TensorFlow!', license='The MIT License', install_requires=[ - 'requests==2.18.1', - 'six==1.10.0', + 'requests==2.19.1', + 'six==1.11.0', 'Pillow==4.1.1', 'BeautifulSoup4==4.6.0', ], From f413bbd6e307c1a0ab8b5a565ff006dd7d5db953 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 15:56:17 -0400 Subject: [PATCH 09/39] Remove old install file --- third_party/docker/docker_install.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100755 third_party/docker/docker_install.sh diff --git a/third_party/docker/docker_install.sh b/third_party/docker/docker_install.sh deleted file mode 100755 index 8edc900..0000000 --- a/third_party/docker/docker_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -# Installs TensorPy, TensorFlow, ImageNet, and required dependancies -# (Special Docker edition!) - -pip install --upgrade pip -echo "Installing TensorPy..." -python setup.py install -echo "Initializing TensorFlow setup on an Ubuntu Docker machine..." -export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.10.0-cp27-none-linux_x86_64.whl -pip install $TF_BINARY_URL -echo "Downloading ImageNet (image database for classifying images)..." -python tensorpy/download_imagenet.py -exit From 9222c54444a0c8b157057e138124a1553f452176 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 16:12:10 -0400 Subject: [PATCH 10/39] Move docker folder to integrations --- {third_party => integrations}/ReadMe.md | 2 +- {third_party => integrations}/docker/ReadMe.md | 0 {third_party => integrations}/docker/docker-entrypoint.sh | 0 {third_party => integrations}/docker/run_docker_test.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename {third_party => integrations}/ReadMe.md (59%) rename {third_party => integrations}/docker/ReadMe.md (100%) rename {third_party => integrations}/docker/docker-entrypoint.sh (100%) rename {third_party => integrations}/docker/run_docker_test.sh (100%) diff --git a/third_party/ReadMe.md b/integrations/ReadMe.md similarity index 59% rename from third_party/ReadMe.md rename to integrations/ReadMe.md index 287ae25..75f693f 100755 --- a/third_party/ReadMe.md +++ b/integrations/ReadMe.md @@ -1,3 +1,3 @@ -## Third-Party / Integrations +## Integrations This folder contains TensorPy integrations diff --git a/third_party/docker/ReadMe.md b/integrations/docker/ReadMe.md similarity index 100% rename from third_party/docker/ReadMe.md rename to integrations/docker/ReadMe.md diff --git a/third_party/docker/docker-entrypoint.sh b/integrations/docker/docker-entrypoint.sh similarity index 100% rename from third_party/docker/docker-entrypoint.sh rename to integrations/docker/docker-entrypoint.sh diff --git a/third_party/docker/run_docker_test.sh b/integrations/docker/run_docker_test.sh similarity index 100% rename from third_party/docker/run_docker_test.sh rename to integrations/docker/run_docker_test.sh From 9f180634a2cb6175eed621c78f9e8600aa2d36dc Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 16:42:43 -0400 Subject: [PATCH 11/39] Update Dockerfile --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ad5690..5eddc8c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -34,14 +34,13 @@ COPY requirements.txt /TensorPy/ COPY setup.py /TensorPy/ COPY tensorpy /TensorPy/tensorpy/ COPY examples /TensorPy/examples/ -COPY third_party/docker /TensorPy/third_party/docker/ -COPY third_party/docker/run_docker_test.sh /TensorPy/ +COPY integrations/docker/run_docker_test.sh /TensorPy/ RUN cd /TensorPy && ls && ./install.sh RUN cd /TensorPy && pip install -r requirements.txt #=================== # Create entrypoint #=================== -COPY third_party/docker/docker-entrypoint.sh / +COPY integrations/docker/docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["/bin/bash"] From 329b5b1c08ccc453eb550d9f72a10d589ddba587 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 18:36:09 -0400 Subject: [PATCH 12/39] Update the docs --- README.md | 14 +++----------- help_docs/pip_installation.md | 10 ++++++++-- help_docs/virtualenv_instructions.md | 9 ++++----- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 84e946d..a147c3b 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@ (**Upgraded** since that video was released!) -You can use TensorPy to classify images by simply passing a URL on the command line, or by using TensorPy in your Python programs. **[TensorFlow](https://www.tensorflow.org/)** does all the real work. TensorPy also simplifies TensorFlow installation by automating several setup steps into a single script (See **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** and **[python3_install.sh](https://github.com/TensorPy/TensorPy/blob/master/python3_install.sh)** for details). +You can use TensorPy to classify images by simply passing a URL on the command line, or by using TensorPy in your Python programs. **[TensorFlow](https://www.tensorflow.org/)** does all the real work. TensorPy also simplifies TensorFlow installation by automating several setup steps into a single script (See **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** for details). (Read **[how_tensorpy_works](https://github.com/TensorPy/TensorPy/blob/master/help_docs/how_tensorpy_works.md)** for a detailed explanation of how TensorPy works.) ## Setup Steps for Mac & Ubuntu/Linux -(**Windows & Docker users**: See the **[Docker ReadMe](https://github.com/TensorPy/TensorPy/blob/master/third_party/docker/ReadMe.md)** for running on a Docker machine. Windows requires Docker to run TensorFlow.) +(**Windows & Docker users**: See the **[Docker ReadMe](https://github.com/TensorPy/TensorPy/blob/master/integrations/docker/ReadMe.md)** for running on a Docker machine. Windows requires Docker to run TensorFlow.) #### **Step 1:** Create and activate a virtual environment named "tensorpy" @@ -33,18 +33,12 @@ cd TensorPy #### **Step 3:** Install TensorPy, TensorFlow, and ImageNet/Inception -For **Python 2.7** users, use **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** to install everything you need. +Use **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** to install everything you need. ```bash ./install.sh ``` -For **Python 3** users, use **[python3_install.sh](https://github.com/TensorPy/TensorPy/blob/master/python3_install.sh)** to install everything you need. - -```bash -./python3_install.sh -``` - #### **Step 4:** Run the examples (NOTE: Run times may vary depending on your Internet connection and computer's CPU speed.) @@ -81,8 +75,6 @@ classify examples/images/ #### **Examples in Python programs:** -*(**NOTE**: If you're using Python 3 instead of Python 2.7, replace "``python``" with "``python3``" on the command line.)* - Classify an image from a local file path using a Python script: (See **[test_python_file_classify.py](https://github.com/TensorPy/TensorPy/blob/master/examples/test_python_file_classify.py)** for details.) ```bash diff --git a/help_docs/pip_installation.md b/help_docs/pip_installation.md index 158a808..6ecdaad 100755 --- a/help_docs/pip_installation.md +++ b/help_docs/pip_installation.md @@ -1,13 +1,19 @@ ### Pip Installation Instructions -Ubuntu/Linux +Ubuntu/Linux: ```bash sudo apt-get install python-pip python-dev ``` -Mac OS X +Mac OS X: ```bash sudo easy_install pip ``` + +OR + +```bash +python -m pip install -U pip +``` diff --git a/help_docs/virtualenv_instructions.md b/help_docs/virtualenv_instructions.md index 2452237..692f620 100755 --- a/help_docs/virtualenv_instructions.md +++ b/help_docs/virtualenv_instructions.md @@ -1,15 +1,15 @@ ### Virtual Environment Setup Tutorial -First: +First, install virtualenv / virtualenvwrapper: ```bash -sudo pip install virtualenv -sudo pip install virtualenvwrapper +python -m pip install virtualenv +python -m pip install virtualenvwrapper export WORKON_HOME=$HOME/.virtualenvs source /usr/local/bin/virtualenvwrapper.sh ``` -Next, follow the command depending on the system you're using: +If you add ``source /usr/local/bin/virtualenvwrapper.sh`` to your local bash file (``~/.bash_profile`` on Mac, ``~/.bashrc`` on Linux), virtualenvwrapper commands will be available to you whenever you open a new command prompt. You can then use the following commands to make those changes active. Mac users: ``source ~/.bash_profile`` Linux users: ``source ~/.bashrc`` @@ -28,7 +28,6 @@ deactivate You can always jump back in later: -(If you're using ``virtualenvwrapper``): ```bash workon tensorpy ``` From 46f224ba1203c48605fc6179fe8e7d405c5df88c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 18:44:17 -0400 Subject: [PATCH 13/39] Version 1.2.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc156a8..1f3db68 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='tensorpy', - version='1.1.0', + version='1.2.0', url='http://tensorpy.com', author='Michael Mintz', author_email='mdmintz@gmail.com', From 96b9e52c5b37fbd27299d62784094b69a62901df Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 4 Aug 2018 19:25:02 -0400 Subject: [PATCH 14/39] Update .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 091919c..83ed8e8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,11 @@ instance/ # Sphinx documentation docs/_build/ +# py.test +.cache/* +.pytest_cache/* +.pytest_config + # PyBuilder target/ From b6e1df3ad4b3feee64e4fc743c2711faf61b5161 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 24 Oct 2018 00:33:30 -0400 Subject: [PATCH 15/39] Update requirements --- requirements.txt | 6 +++--- setup.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index afa93a6..b03feca 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -requests==2.19.1 -six==1.11.0 +six +requests==2.20.0 Pillow==4.1.1 -BeautifulSoup4==4.6.0 +BeautifulSoup4>=4.6.0 -e . diff --git a/setup.py b/setup.py index 1f3db68..91599dc 100644 --- a/setup.py +++ b/setup.py @@ -16,10 +16,10 @@ description='Easy Image Classification with TensorFlow!', license='The MIT License', install_requires=[ - 'requests==2.19.1', - 'six==1.11.0', + 'six', + 'requests==2.20.0', 'Pillow==4.1.1', - 'BeautifulSoup4==4.6.0', + 'BeautifulSoup4>=4.6.0', ], packages=['tensorpy'], entry_points={ From 616a4afe24e34c7f2dcf7236d9b29bc7e981b7ee Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 24 Oct 2018 00:33:49 -0400 Subject: [PATCH 16/39] Version 1.3.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 91599dc..e448db9 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='tensorpy', - version='1.2.0', + version='1.3.0', url='http://tensorpy.com', author='Michael Mintz', author_email='mdmintz@gmail.com', From 3814fab12b07f16ef391983b90d60c235bf24f5e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 24 Oct 2018 00:59:20 -0400 Subject: [PATCH 17/39] Sync setup file --- setup.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e448db9..d846e62 100644 --- a/setup.py +++ b/setup.py @@ -5,16 +5,29 @@ """ from setuptools import setup, find_packages # noqa +from os import path + + +this_directory = path.abspath(path.dirname(__file__)) +long_description = None +try: + with open(path.join(this_directory, 'README.md'), 'rb') as f: + long_description = f.read().decode('utf-8') +except IOError: + long_description = 'Easy Image Classification with TensorFlow!' setup( name='tensorpy', version='1.3.0', - url='http://tensorpy.com', + description='Easy Image Classification with TensorFlow!', + long_description=long_description, + long_description_content_type='text/markdown', + url='https://github.com/TensorPy/TensorPy', + platforms=["Linux", "Unix", "Mac OS-X"], author='Michael Mintz', author_email='mdmintz@gmail.com', maintainer='Michael Mintz', - description='Easy Image Classification with TensorFlow!', - license='The MIT License', + license="MIT", install_requires=[ 'six', 'requests==2.20.0', From 320f6476bcc91cc2e4a9534262c717d8cb995e03 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Wed, 24 Oct 2018 01:00:12 -0400 Subject: [PATCH 18/39] Version 1.3.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d846e62..dfdc789 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='tensorpy', - version='1.3.0', + version='1.3.1', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From 8c7259e733333da618f0217bdfe5aceed8e844f0 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jun 2019 21:05:34 -0400 Subject: [PATCH 19/39] Fix image converter --- tensorpy/image_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorpy/image_base.py b/tensorpy/image_base.py index 237b6bc..faf1a80 100644 --- a/tensorpy/image_base.py +++ b/tensorpy/image_base.py @@ -26,14 +26,14 @@ def convert_image_file_to_jpg(file_name): outfile = f + ".jpg" if infile != outfile: try: - Image.open(infile).convert('RGBA').save(outfile, "JPEG") + Image.open(infile).convert('RGB').save(outfile, "JPEG") except IOError: raise Exception("Cannot convert %s to jpg!" % file_name) def load_image_from_url(image_url): response = requests.get(image_url) - image = Image.open(StringIO(response.content)).convert('RGBA') + image = Image.open(StringIO(response.content)).convert('RGB') return image From 339131966de1c46e87d2ec14afaf6b827324b34f Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jun 2019 21:06:11 -0400 Subject: [PATCH 20/39] Replace deprecated method with new version --- tensorpy/classify_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorpy/classify_image.py b/tensorpy/classify_image.py index 40a05a8..459f01a 100644 --- a/tensorpy/classify_image.py +++ b/tensorpy/classify_image.py @@ -13,7 +13,7 @@ os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2' FLAGS = tf.app.flags.FLAGS -tf.logging.set_verbosity(tf.logging.ERROR) +tf.compat.v1.logging.set_verbosity(tf.compat.v1.logging.ERROR) tf.app.flags.DEFINE_string( 'model_dir', settings.IMAGENET_FOLDER, """Path to classify_image_graph_def.pb, """ From bdc20850f99e0090c72f5cc474ad72494eee13e9 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jun 2019 21:14:07 -0400 Subject: [PATCH 21/39] Replace deprecated methods --- tensorpy/classify_image.py | 2 +- tensorpy/download_imagenet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorpy/classify_image.py b/tensorpy/classify_image.py index 459f01a..2c20196 100644 --- a/tensorpy/classify_image.py +++ b/tensorpy/classify_image.py @@ -126,4 +126,4 @@ def external_run(image): if __name__ == '__main__': - tf.app.run() + tf.compat.v1.app.run() diff --git a/tensorpy/download_imagenet.py b/tensorpy/download_imagenet.py index ab425e7..f7bf534 100644 --- a/tensorpy/download_imagenet.py +++ b/tensorpy/download_imagenet.py @@ -43,4 +43,4 @@ def main(_): maybe_download_and_extract() -tf.app.run() +tf.compat.v1.app.run() From 5eb0bec7e4c4e9a7f02f637e23ea876ea595ab71 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jun 2019 21:15:02 -0400 Subject: [PATCH 22/39] Update requirements --- install.sh | 2 +- requirements.txt | 6 +++--- setup.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 0676a09..2062c23 100755 --- a/install.sh +++ b/install.sh @@ -8,7 +8,7 @@ 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.9.0-cp27-none-linux_x86_64.whl + export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl pip install --ignore-installed --upgrade $TF_BINARY_URL elif [ $value = "Darwin" ] then diff --git a/requirements.txt b/requirements.txt index b03feca..643dffc 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ six -requests==2.20.0 -Pillow==4.1.1 +tensorflow>=1.14.0 +requests>=2.22.0 +Pillow>=6.0.0 BeautifulSoup4>=4.6.0 --e . diff --git a/setup.py b/setup.py index dfdc789..0d24f1e 100644 --- a/setup.py +++ b/setup.py @@ -30,8 +30,9 @@ license="MIT", install_requires=[ 'six', - 'requests==2.20.0', - 'Pillow==4.1.1', + 'tensorflow>=1.14.0', + 'requests>=2.22.0', + 'Pillow>=6.0.0', 'BeautifulSoup4>=4.6.0', ], packages=['tensorpy'], From 7c277d0534e7ba45da184af489687073ecd3be75 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sun, 30 Jun 2019 21:15:20 -0400 Subject: [PATCH 23/39] Version 1.4.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0d24f1e..b56063d 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='tensorpy', - version='1.3.1', + version='1.4.0', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From d0d7d0a078b94e943f7d4d5722ad7e98444f7a26 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 5 Jul 2019 15:31:25 -0400 Subject: [PATCH 24/39] Use Pillow>=6.1.0 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 643dffc..071d028 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ six tensorflow>=1.14.0 requests>=2.22.0 -Pillow>=6.0.0 +Pillow>=6.1.0 BeautifulSoup4>=4.6.0 diff --git a/setup.py b/setup.py index b56063d..5d887b8 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ 'six', 'tensorflow>=1.14.0', 'requests>=2.22.0', - 'Pillow>=6.0.0', + 'Pillow>=6.1.0', 'BeautifulSoup4>=4.6.0', ], packages=['tensorpy'], From b222f719e80981de4fc405f2683b9757988276b7 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 5 Jul 2019 15:32:07 -0400 Subject: [PATCH 25/39] Fix indentation --- tensorpy/classify.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorpy/classify.py b/tensorpy/classify.py index 39ff08e..518e97e 100644 --- a/tensorpy/classify.py +++ b/tensorpy/classify.py @@ -124,9 +124,9 @@ def main(): break if images_classified >= settings.MAX_IMAGES_PER_PAGE: - print("\n(NOTE: Exceeded page classification limit " - "of %d images per URL! Stopping early.)" % ( - settings.MAX_IMAGES_PER_PAGE)) + print("\n(NOTE: Exceeded page classification limit " + "of %d images per URL! Stopping early.)" % ( + settings.MAX_IMAGES_PER_PAGE)) if images_classified == 0: print("\nCould not find images to classify on the page! " From 1f70a032b3c1de64658aab406b8e86381993f91c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 5 Jul 2019 15:34:53 -0400 Subject: [PATCH 26/39] Better image I/O --- tensorpy/image_base.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tensorpy/image_base.py b/tensorpy/image_base.py index faf1a80..98aa7c1 100644 --- a/tensorpy/image_base.py +++ b/tensorpy/image_base.py @@ -14,9 +14,9 @@ def get_image_file_dimensions(file_name): - image = Image.open(file_name) - image_dimensions = image.size # (width, height) tuple - return image_dimensions + with Image.open(file_name) as image: + image_dimensions = image.size # (width, height) tuple + return image_dimensions def convert_image_file_to_jpg(file_name): @@ -26,15 +26,17 @@ def convert_image_file_to_jpg(file_name): outfile = f + ".jpg" if infile != outfile: try: - Image.open(infile).convert('RGB').save(outfile, "JPEG") + with Image.open(infile) as image: + image.convert('RGB').save(outfile, "JPEG") except IOError: raise Exception("Cannot convert %s to jpg!" % file_name) def load_image_from_url(image_url): response = requests.get(image_url) - image = Image.open(StringIO(response.content)).convert('RGB') - return image + with Image.open(StringIO(response.content)) as image: + image.convert('RGB') + return image def get_image_dimensions(image): From d4af72529f3bf50d07dc6557136efc9858539ac7 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 5 Jul 2019 15:35:09 -0400 Subject: [PATCH 27/39] Version 1.4.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5d887b8..5f24008 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='tensorpy', - version='1.4.0', + version='1.4.1', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From ad8542919f8afdbeb02a13d1fa77c21113b5e46f Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 10 Aug 2019 23:31:51 -0400 Subject: [PATCH 28/39] Use tensorflow==1.14.0 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 071d028..9a8a026 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ six -tensorflow>=1.14.0 +tensorflow==1.14.0 requests>=2.22.0 Pillow>=6.1.0 BeautifulSoup4>=4.6.0 diff --git a/setup.py b/setup.py index 5f24008..9deac6b 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ license="MIT", install_requires=[ 'six', - 'tensorflow>=1.14.0', + 'tensorflow==1.14.0', 'requests>=2.22.0', 'Pillow>=6.1.0', 'BeautifulSoup4>=4.6.0', From e1138f22fe128e167064f472500d571835ee9614 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 10 Aug 2019 23:32:07 -0400 Subject: [PATCH 29/39] Version 1.4.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9deac6b..c70f308 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='tensorpy', - version='1.4.1', + version='1.4.2', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From b137a25745cef4a1172a8597d7468afa5956ae27 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 16:54:02 -0400 Subject: [PATCH 30/39] Update Python requirements --- requirements.txt | 8 ++++---- setup.py | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9a8a026..a6995c3 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -six -tensorflow==1.14.0 -requests>=2.22.0 -Pillow>=6.1.0 +tensorflow==1.15.4 +six>=1.11.0 +requests>=2.18.4 +Pillow==5.4.1 BeautifulSoup4>=4.6.0 diff --git a/setup.py b/setup.py index c70f308..2cccdac 100644 --- a/setup.py +++ b/setup.py @@ -28,11 +28,17 @@ author_email='mdmintz@gmail.com', maintainer='Michael Mintz', license="MIT", + classifiers=[ + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + ], + python_requires='>=3.5, <3.8', install_requires=[ - 'six', - 'tensorflow==1.14.0', - 'requests>=2.22.0', - 'Pillow>=6.1.0', + 'tensorflow==1.15.4', + 'six>=1.11.0', + 'requests>=2.18.4', + 'Pillow==5.4.1', 'BeautifulSoup4>=4.6.0', ], packages=['tensorpy'], From 36bb5f553f0488b8eba7c0b70c7a35ffccb47dbb Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 16:55:38 -0400 Subject: [PATCH 31/39] Add Easy-Deploy / Easy-Publish --- setup.py | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2cccdac..394a77c 100644 --- a/setup.py +++ b/setup.py @@ -5,17 +5,47 @@ """ from setuptools import setup, find_packages # noqa -from os import path +import os +import sys -this_directory = path.abspath(path.dirname(__file__)) +this_directory = os.path.abspath(os.path.dirname(__file__)) long_description = None try: - with open(path.join(this_directory, 'README.md'), 'rb') as f: + with open(os.path.join(this_directory, 'README.md'), 'rb') as f: long_description = f.read().decode('utf-8') except IOError: long_description = 'Easy Image Classification with TensorFlow!' +if sys.argv[-1] == 'publish': + reply = None + input_method = input + if not sys.version_info[0] >= 3: + input_method = raw_input # noqa + reply = str(input_method( + '>>> Confirm release PUBLISH to PyPI? (yes/no): ')).lower().strip() + if reply == 'yes': + print("\n*** Checking code health with flake8:\n") + flake8_status = os.system("flake8 --exclude=temp") + if flake8_status != 0: + print("\nWARNING! Fix flake8 issues before publishing to PyPI!\n") + sys.exit() + else: + print("*** No flake8 issues detected. Continuing...") + print("\n*** Rebuilding distribution packages: ***\n") + os.system('rm -f dist/*.egg; rm -f dist/*.tar.gz; rm -f dist/*.whl') + os.system('python setup.py sdist bdist_wheel') # Create new tar/wheel + print("\n*** Installing twine: *** (Required for PyPI uploads)\n") + os.system("python -m pip install --upgrade 'twine>=1.15.0'") + print("\n*** Installing tqdm: *** (Required for PyPI uploads)\n") + os.system("python -m pip install --upgrade 'tqdm>=4.49.0'") + print("\n*** Publishing The Release to PyPI: ***\n") + os.system('python -m twine upload dist/*') # Requires ~/.pypirc Keys + print("\n*** The Release was PUBLISHED SUCCESSFULLY to PyPI! :) ***\n") + else: + print("\n>>> The Release was NOT PUBLISHED to PyPI! <<<\n") + sys.exit() + setup( name='tensorpy', version='1.4.2', From a417458fd24ab197b590325a786e17861918751b Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 16:57:22 -0400 Subject: [PATCH 32/39] Print the filepath for ImageNet Inception DB downloads --- tensorpy/download_imagenet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tensorpy/download_imagenet.py b/tensorpy/download_imagenet.py index f7bf534..1dd49b3 100644 --- a/tensorpy/download_imagenet.py +++ b/tensorpy/download_imagenet.py @@ -26,6 +26,7 @@ def maybe_download_and_extract(): os.makedirs(dest_directory) filename = DATA_URL.split('/')[-1] filepath = os.path.join(dest_directory, filename) + print("ImageNet Inception DB filepath: %s" % filepath) if not os.path.exists(filepath): def _progress(count, block_size, total_size): sys.stdout.write('\r>> Downloading %s %.1f%%' % ( From 0eb02b6e88e40f957632b0aa78ab6ccdb3a7692c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 16:57:41 -0400 Subject: [PATCH 33/39] Update the ReadMe --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a147c3b..86c9bee 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,10 @@ (**[Watch the 2-minute tutorial on YouTube](https://www.youtube.com/watch?v=lVtzaHcUE7Q)**) -(**Upgraded** since that video was released!) +### Requirements: + +* A Mac or Linux machine +* Python 3.5, 3.6, or 3.7 You can use TensorPy to classify images by simply passing a URL on the command line, or by using TensorPy in your Python programs. **[TensorFlow](https://www.tensorflow.org/)** does all the real work. TensorPy also simplifies TensorFlow installation by automating several setup steps into a single script (See **[install.sh](https://github.com/TensorPy/TensorPy/blob/master/install.sh)** for details). From 4389e2975422a5821ae66a90e5e082a192b57a2c Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 16:58:45 -0400 Subject: [PATCH 34/39] Version 1.5.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 394a77c..5344053 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( name='tensorpy', - version='1.4.2', + version='1.5.0', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From 6af417b3b28b9ab97ab915ba0200264e52526284 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 17:29:54 -0400 Subject: [PATCH 35/39] Update the ReadMe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 86c9bee..56b21ec 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![](http://cdn2.hubspot.net/hubfs/100006/images/tensorpy_logo_4_p.png "TensorPy") # TensorPy -[![pypi](https://img.shields.io/pypi/v/tensorpy.svg)](https://pypi.python.org/pypi/tensorpy) [![Python version](https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg "Python version")](https://docs.python.org/2/) [![Join the chat at https://gitter.im/TensorPy/Lobby](https://badges.gitter.im/TensorPy/TensorPy.svg)](https://gitter.im/TensorPy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![pypi](https://img.shields.io/pypi/v/tensorpy.svg)](https://pypi.python.org/pypi/tensorpy) [![Python version](https://img.shields.io/badge/python-3.5,_3.6,_3.7-22AADD.svg "Python version")](https://docs.python.org/2/) [![Join the chat at https://gitter.im/TensorPy/Lobby](https://badges.gitter.im/TensorPy/TensorPy.svg)](https://gitter.im/TensorPy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) **Easy Image Classification with TensorFlow** From 06d01997a1f98b8cfe74e90148310bdbc006acb3 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 17:52:58 -0400 Subject: [PATCH 36/39] Update Python dependencies --- requirements.txt | 9 +++++---- setup.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index a6995c3..ae3e67b 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ tensorflow==1.15.4 -six>=1.11.0 -requests>=2.18.4 -Pillow==5.4.1 -BeautifulSoup4>=4.6.0 +pip>=20.2.3 +six>=1.15.0 +requests>=2.24.0 +Pillow==7.2.0 +beautifulsoup4==4.9.1 diff --git a/setup.py b/setup.py index 5344053..6347a3e 100644 --- a/setup.py +++ b/setup.py @@ -66,10 +66,11 @@ python_requires='>=3.5, <3.8', install_requires=[ 'tensorflow==1.15.4', - 'six>=1.11.0', - 'requests>=2.18.4', - 'Pillow==5.4.1', - 'BeautifulSoup4>=4.6.0', + 'pip>=20.2.3', + 'six>=1.15.0', + 'requests>=2.24.0', + 'Pillow==7.2.0', + 'beautifulsoup4==4.9.1', ], packages=['tensorpy'], entry_points={ From 47a52141b7699bb5ec04f4eb294d000ab1296efc Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Fri, 25 Sep 2020 17:53:36 -0400 Subject: [PATCH 37/39] Version 1.6.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6347a3e..21fb0ad 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( name='tensorpy', - version='1.5.0', + version='1.6.0', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown', From 25f6bbd05caf37b883f4a30b1a58ee08c74bf9f1 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 26 Sep 2020 19:58:44 -0400 Subject: [PATCH 38/39] Update a Python dependency: beautifulsoup4==4.9.2 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ae3e67b..5f4fae2 100755 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ pip>=20.2.3 six>=1.15.0 requests>=2.24.0 Pillow==7.2.0 -beautifulsoup4==4.9.1 +beautifulsoup4==4.9.2 diff --git a/setup.py b/setup.py index 21fb0ad..064998f 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ 'six>=1.15.0', 'requests>=2.24.0', 'Pillow==7.2.0', - 'beautifulsoup4==4.9.1', + 'beautifulsoup4==4.9.2', ], packages=['tensorpy'], entry_points={ From 53adc31d3ae38dd6a4f5e35f41c7f4d0b16e0de5 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 26 Sep 2020 19:59:01 -0400 Subject: [PATCH 39/39] Version 1.6.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 064998f..863853e 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( name='tensorpy', - version='1.6.0', + version='1.6.1', description='Easy Image Classification with TensorFlow!', long_description=long_description, long_description_content_type='text/markdown',