From a48d6de5d0ed670cbabcbf68a9077817fc67272c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 02:02:49 +0000 Subject: [PATCH 1/4] Bump jinja2 from 2.10.1 to 2.11.3 Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/2.10.1...2.11.3) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3b8074c6..40744906 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,7 +51,7 @@ ipaddr==2.2.0 ipaddress==1.0.23 ipwhois==1.2.0 itsdangerous==1.1.0 -Jinja2==2.10.1 +Jinja2==2.11.3 jsonpickle==2.1.0 kombu==5.2.4 Mako==1.2.0 diff --git a/setup.py b/setup.py index e0aa4a1d..f6b9c553 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ 'ipaddress==1.0.18', 'ipwhois==1.0.0', 'itsdangerous==0.24', - 'Jinja2==2.9.6', + 'Jinja2==2.11.3', 'jsonpickle==0.9.5', 'kombu==4.1.0', 'Mako==1.0.7', From 268c233114167f4a16fb3e97d82567d82575edd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 17:38:17 +0000 Subject: [PATCH 2/4] Bump mako from 1.2.0 to 1.2.2 Bumps [mako](https://github.com/sqlalchemy/mako) from 1.2.0 to 1.2.2. - [Release notes](https://github.com/sqlalchemy/mako/releases) - [Changelog](https://github.com/sqlalchemy/mako/blob/main/CHANGES) - [Commits](https://github.com/sqlalchemy/mako/commits) --- updated-dependencies: - dependency-name: mako dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3b8074c6..49d5f56f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,7 +54,7 @@ itsdangerous==1.1.0 Jinja2==2.10.1 jsonpickle==2.1.0 kombu==5.2.4 -Mako==1.2.0 +Mako==1.2.2 MarkupSafe==1.1.0 maxminddb==2.2.0 migrate==0.3.8 diff --git a/setup.py b/setup.py index e0aa4a1d..a856d264 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ 'Jinja2==2.9.6', 'jsonpickle==0.9.5', 'kombu==4.1.0', - 'Mako==1.0.7', + 'Mako==1.2.2', 'MarkupSafe==1.0', 'maxminddb==1.3.0', 'migrate==0.3.8', From 8e1b2ab87ed61a3614def5ce9117a90a254c3179 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 23:42:55 +0000 Subject: [PATCH 3/4] Bump certifi from 2021.10.8 to 2022.12.7 Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.10.8 to 2022.12.7. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2021.10.08...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3b8074c6..9b05d2e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ bcrypt==3.2.0 billiard==3.6.4.0 blinker==1.4 celery==5.2.6 -certifi==2021.10.8 +certifi==2022.12.7 cffi==1.15.0 chardet==4.0.0 charset-normalizer==2.0.12 diff --git a/setup.py b/setup.py index e0aa4a1d..56a40b54 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ 'billiard==3.5.0.3', 'blinker==1.4', 'celery==4.1.0', - 'certifi==2017.11.5', + 'certifi==2022.12.7', 'cffi==1.10.0', 'chardet==3.0.4', 'click==6.7', From f5a2470b0cfaa8e45d257698aaf8957f85e9d83a Mon Sep 17 00:00:00 2001 From: David Cuellar Date: Mon, 19 Dec 2022 00:50:55 -0600 Subject: [PATCH 4/4] 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 97d796c1..8b93e100 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 96917869..64cc23f2 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 a004361f..242615ce 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={