Moving everything over from deps branch

Most of the updates were introduced in other branches, so this is all that's left to be merged from the deps upgrading branch
InQuest · Aug 28, 2023 · 82e1745 · 82e1745
1 parent 01e929e
commit 82e1745
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 66 deletions.
diff --git a/app/models/users.py b/app/models/users.py
@@ -1,5 +1,4 @@
-from itsdangerous import (URLSafeTimedSerializer
-                          as Serializer, BadSignature)
+from itsdangerous import (URLSafeTimedSerializer as Serializer, BadSignature)
 
 from app import db
 from app.models import metadata, scripts

diff --git a/setup.py b/setup.py
@@ -1,5 +1,8 @@
+import os
 from setuptools import setup, find_packages
 
+requirements = open(os.path.join(os.path.dirname(__file__), "requirements.txt")).read().strip().split('\n')
+
 setup(
     name='threatkb',
     version='0.1.1',
@@ -17,70 +20,7 @@
     py_modules=['config'],
     packages=find_packages(exclude=['migrations', 'venv', 'contrib', 'docs', 'tests', 'build', 'dist', 'flask']),
     license='GPL-2.0',
-    install_requires=[
-        'alembic==1.7.7',
-        'amqp==5.1.1',
-        'app==0.0.1',
-        'Babel==2.10.1',
-        'bcrypt==3.2.0',
-        'billiard==3.6.4.0',
-        'blinker==1.4',
-        'celery==5.2.6',
-        'certifi==2022.12.7',
-        'cffi==1.15.0',
-        'chardet==4.0.0',
-        'click==8.1.2',
-        'decorator==5.1.1',
-        'deepdiff==5.8.0',
-        'dnspython==2.0.0',
-        'Flask==1.1.2',
-        'Flask-Autodoc==0.1.2',
-        'Flask-Babel==2.0.0',
-        'Flask-Bcrypt==1.0.1',
-        'Flask-Login==0.5.0',
-        'Flask-Mail==0.9.1',
-        'Flask-Migrate==2.6.0',
-        'Flask-OpenID==1.3.0',
-        'Flask-Script==2.0.6',
-        'Flask-SQLAlchemy==2.5.1',
-        'Flask-WhooshAlchemy==0.56',
-        'Flask-WTF==1.0.1',
-        'flup==1.0.3',
-        'geoip2==4.5.0',
-        'idna==3.3',
-        'ipaddr==2.2.0',
-        'ipaddress==1.0.23',
-        'ipwhois==1.2.0',
-        'itsdangerous==1.1.0',
-        'Jinja2==2.11.3',
-        'jsonpickle==2.1.0',
-        'kombu==5.2.4',
-        'Mako==1.2.2',
-        'MarkupSafe==1.1.0',
-        'maxminddb==2.2.0',
-        'migrate==0.3.8',
-        'more-itertools==8.12.0',
-        'ply==3.11',
-        'pycparser==2.21',
-        'python-dateutil==2.8.2',
-        'python-editor==1.0.4',
-        'python-openid==2.2.5',
-        'pytz==2022.1',
-        'pyzipcode==3.0.1',
-        'redis==4.4.4',
-        'requests==2.27.1',
-        'six==1.16.0',
-        'speaklater==1.3',
-        'SQLAlchemy==1.4.36',
-        'sqlalchemy-migrate==0.13.0',
-        'Tempita==0.5.2',
-        'urllib3==1.26.9',
-        'vine==5.0.0',
-        'Werkzeug==2.2.3',
-        'Whoosh==2.7.4',
-        'WTForms==3.0.1',
-        'yara-python==4.2.0'
-    ],
+    install_requires=requirements,
     extra_require={
         'dev': [],
         'test': [],