From f5a2470b0cfaa8e45d257698aaf8957f85e9d83a Mon Sep 17 00:00:00 2001 From: David Cuellar Date: Mon, 19 Dec 2022 00:50:55 -0600 Subject: [PATCH] Move dependency updates and trying to sync with setup.py. --- install.sh | 8 +++- requirements.txt | 2 + setup.py | 104 +++++++++++++++++++++++------------------------ 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/install.sh b/install.sh index 97d796c..8b93e10 100755 --- a/install.sh +++ b/install.sh @@ -7,9 +7,15 @@ if [ $? -ne 0 ]; then exit 1 fi +env/bin/python3 setup.py sdist +if [ $? -ne 0 ]; then + echo "error: failed to install python3 setup.py sdist" + exit 1 +fi + env/bin/pip3 install -r requirements.txt if [ $? -ne 0 ]; then - echo "error: failed to install python requirements.txt" + echo "error: failed to install pip3 requirements.txt" exit 1 fi diff --git a/requirements.txt b/requirements.txt index 9691786..64cc23f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -84,6 +84,7 @@ redis==4.2.2 requests==2.27.1 semantic-version==2.10.0 setuptools-rust==1.5.2 +protobuf==3.20.3 six==1.16.0 speaklater==1.3 SQLAlchemy==1.4.36 @@ -91,6 +92,7 @@ sqlalchemy-migrate==0.13.0 sqlparse==0.4.2 Tempita==0.5.2 termcolor==1.1.0 +tabulate==0.8.9 threatkb==0.1.1 typing_extensions==4.4.0 urllib3==1.26.9 diff --git a/setup.py b/setup.py index a004361..242615c 100644 --- a/setup.py +++ b/setup.py @@ -27,70 +27,68 @@ license='...', install_requires=[ - 'alembic==0.9.4', - 'amqp==2.2.1', + 'alembic==1.7.7', + 'amqp==5.1.1', 'app==0.0.1', - 'Babel==2.4.0', - 'bcrypt==3.1.3', - 'billiard==3.5.0.3', + 'Babel==2.10.1', + 'bcrypt==3.2.0', + 'billiard==3.6.4.0', 'blinker==1.4', - 'celery==4.1.0', + 'celery==5.2.6', 'certifi==2022.12.7', - 'cffi==1.10.0', - 'chardet==3.0.4', - 'click==6.7', - 'decorator==4.0.11', - 'deepdiff==3.3.0', - 'dnspython==1.15.0', - 'Flask==1.0', + '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==0.8', - 'Flask-Bcrypt==0.7.1', - 'Flask-Login==0.4.0', - 'Flask-Mail==0.7.6', - 'Flask-Migrate==2.1.0', - 'Flask-OpenID==1.2.5', - 'Flask-Script==2.0.5', - 'Flask-SQLAlchemy==0.16', - 'Flask-WhooshAlchemy==0.54a0', - 'Flask-WTF==0.8.4', - 'flup==1.0.2', - 'geoip2==2.6.0', - 'idna==2.6', - 'ipaddr==2.1.11', - 'ipaddress==1.0.18', - 'ipwhois==1.0.0', - 'itsdangerous==0.24', + '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==0.9.5', - 'kombu==4.1.0', + 'jsonpickle==2.1.0', + 'kombu==5.2.4', 'Mako==1.2.2', - 'MarkupSafe==1.0', - 'maxminddb==1.3.0', + 'MarkupSafe==1.1.0', + 'maxminddb==2.2.0', 'migrate==0.3.8', - 'more-itertools==3.2.0', - 'MySQL-python==1.2.5', - 'ply==3.10', - 'pycparser==2.18', - 'pysqlite==2.8.3', - 'python-dateutil==2.6.1', - 'python-editor==1.0.3', + '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==2017.2', - 'pyzipcode==1.0', - 'redis==2.10.6', - 'requests==2.20.0', - 'six==1.10.0', + 'pytz==2022.1', + 'pyzipcode==3.0.1', + 'redis==4.2.2', + 'requests==2.27.1', + 'six==1.16.0', 'speaklater==1.3', - 'SQLAlchemy==0.7.9', - 'sqlalchemy-migrate==0.7.2', + 'SQLAlchemy==1.4.36', + 'sqlalchemy-migrate==0.13.0', 'Tempita==0.5.2', - 'urllib3==1.25.6', - 'vine==1.1.4', - 'Werkzeug==0.15.3', + 'urllib3==1.26.9', + 'vine==5.0.0', + 'Werkzeug==0.15.5', 'Whoosh==2.7.4', - 'WTForms==2.1', - 'yara-python==3.6.3' + 'WTForms==3.0.1', + 'yara-python==4.2.0' ], extra_require={