Merge pull request #367 from Kegbot/mikey/dependencies

Update requirements based on pip-compile.

requirements.txt

@@ -1,55 +1,60 @@
-Django==1.11.2
-MySQL-python==1.2.5
-Pillow==4.1.1
-PyYAML==3.12
-amqp==2.1.4
-billiard==3.5.0.2
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file requirements.txt setup.py
+#
+amqp==2.1.4               # via kombu
+billiard==3.5.0.2         # via celery
 celery==4.0.2
-certifi==2017.4.17
-chardet==3.0.4
-colorama==0.3.9
-configparser==3.5.0
-contextlib2==0.5.5
-django-appconf==1.0.2
+certifi==2017.4.17        # via requests
+chardet==3.0.4            # via requests
+colorama==0.3.9           # via rednose
+configparser==3.5.0       # via flake8
+contextlib2==0.5.5        # via vcrpy
+django-appconf==1.0.2     # via django-imagekit
 django-bootstrap-pagination==1.6.2
 django-crispy-forms==1.6.1
 django-imagekit==4.0.1
 django-nose==1.4.4
 django-redis==4.8.0
 django-registration==2.2
-enum34==1.1.6
+django==1.11.2            # via jsonfield
+enum34==1.1.6             # via flake8
 flake8==3.3.0
-foursquare==2014.4.10
-funcsigs==1.0.2
+foursquare==1!2016.9.12
+funcsigs==1.0.2           # via mock
 gunicorn==19.7.1
 httplib2==0.10.3
-idna==2.5
+idna==2.5                 # via requests
 isodate==0.5.4
 jsonfield==2.0.2
 kegbot-api==1.1.0
 kegbot-pyutils==0.1.8
-kombu==4.0.2
-mccabe==0.6.1
+kombu==4.0.2              # via celery
+mccabe==0.6.1             # via flake8
 mock==2.0.0
-nose==1.3.7
-oauthlib==2.0.2
-olefile==0.44
-pbr==3.1.1
-pilkit==2.0
-protobuf==2.4.1
-pycodestyle==2.3.1
-pyflakes==1.5.0
+mysql-python==1.2.5
+nose==1.3.7               # via django-nose
+oauthlib==2.0.2           # via requests-oauthlib
+olefile==0.44             # via pillow
+pbr==3.1.1                # via mock
+pilkit==2.0               # via django-imagekit
+pillow==4.1.1
+protobuf==3.3.0
+pycodestyle==2.3.1        # via flake8
+pyflakes==1.5.0           # via flake8
 python-gflags==3.1.1
 pytz==2017.2
+pyyaml==3.12              # via vcrpy
 redis==2.10.5
 rednose==1.2.2
-requests-mock==1.3.0
 requests-oauthlib==0.8.0
 requests==2.18.1
-six==1.10.0
-termstyle==0.1.11
+six==1.10.0               # via django-imagekit, foursquare, mock, protobuf, tweepy, vcrpy
+termstyle==0.1.11         # via rednose
 tweepy==3.5.0
-urllib3==1.21.1
+urllib3==1.21.1           # via requests
 vcrpy==1.11.1
-vine==1.1.3
-wrapt==1.10.10
+vine==1.1.3               # via amqp
+wrapt==1.10.10            # via vcrpy

setup.py

@@ -45,30 +45,25 @@
 ]
 
 
-def setup_package():
-    setup(
-        name='kegbot',
-        version=VERSION,
-        description=SHORT_DESCRIPTION,
-        long_description=LONG_DESCRIPTION,
-        author='Bevbot LLC',
-        author_email='[email protected]',
-        url='https://kegbot.org/',
-        packages=find_packages(),
-        scripts=[
-            'bin/kegbot',
-            'bin/setup-kegbot.py',
-        ],
-        install_requires=DEPENDENCIES,
-        dependency_links=[
-            'https://github.com/rem/python-protobuf/tarball/master#egg=protobuf-2.4.1',
-        ],
-        include_package_data=True,
-        entry_points={
-            'console_scripts': ['instance=django.core.management:execute_manager'],
-        },
-    )
-
-
-if __name__ == '__main__':
-    setup_package()
+setup(
+    name='kegbot',
+    version=VERSION,
+    description=SHORT_DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    author='Bevbot LLC',
+    author_email='[email protected]',
+    url='https://kegbot.org/',
+    packages=find_packages(),
+    scripts=[
+        'bin/kegbot',
+        'bin/setup-kegbot.py',
+    ],
+    install_requires=DEPENDENCIES,
+    dependency_links=[
+        'https://github.com/rem/python-protobuf/tarball/master#egg=protobuf-2.4.1',
+    ],
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['instance=django.core.management:execute_manager'],
+    },
+)