From fd83832f43b229d731878e4855ad5f5c7f073bc5 Mon Sep 17 00:00:00 2001
From: Jakub Judiny <judiny@cesnet.cz>
Date: Wed, 5 Apr 2023 15:38:50 +0200
Subject: [PATCH] Upgrade Python dependencies (Redmine issue: #7632)

---
 conf/requirements-dev.pip        | 19 +++++-----
 conf/requirements-latest-dev.pip |  1 +
 conf/requirements-latest.pip     |  3 --
 conf/requirements.pip            | 62 +++++++++++++++-----------------
 4 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/conf/requirements-dev.pip b/conf/requirements-dev.pip
index 70218ab2..b5dec11a 100644
--- a/conf/requirements-dev.pip
+++ b/conf/requirements-dev.pip
@@ -1,9 +1,10 @@
-setuptools==46.1.3
-wheel==0.34.2
-nose2==0.11.0
-coverage==5.0.4
-pyflakes==2.1.1
-pylint==2.4.4
-sendria==2.2.2
-sphinx==2.4.4
-sphinx-rtd-theme==0.4.3
+setuptools>=67.6.1,<68.0.0
+wheel>=0.38.4,<0.39.0
+nose2>=0.12.0,<0.13.0
+coverage>=7.2.2,<7.3.0
+pyflakes>=3.0.1,<3.1.0
+pylint>=2.16.4,<2.17.0
+sendria>=2.2.2,<2.3.0
+sphinx==5.3.0
+sphinx-rtd-theme==1.2.0
+python-dotenv>=0.21.1,<1.0.0
diff --git a/conf/requirements-latest-dev.pip b/conf/requirements-latest-dev.pip
index 10579462..dd6d9481 100644
--- a/conf/requirements-latest-dev.pip
+++ b/conf/requirements-latest-dev.pip
@@ -7,3 +7,4 @@ pylint
 sendria
 sphinx
 sphinx-rtd-theme
+python-dotenv
diff --git a/conf/requirements-latest.pip b/conf/requirements-latest.pip
index ded358ef..023e2b69 100644
--- a/conf/requirements-latest.pip
+++ b/conf/requirements-latest.pip
@@ -1,6 +1,4 @@
-python-dotenv
 pytz
-ply
 psycopg2
 babel
 wtforms
@@ -22,7 +20,6 @@ flask-debugtoolbar
 flask-jsglue
 dnspython
 geoip2
-maxminddb
 requests
 rrdtool
 pyyaml
diff --git a/conf/requirements.pip b/conf/requirements.pip
index 3785a603..1ae8ad08 100644
--- a/conf/requirements.pip
+++ b/conf/requirements.pip
@@ -1,40 +1,36 @@
-python-dotenv==0.12.0
-pytz==2019.3
-ply==3.11
-psycopg2==2.8.4
-babel==2.8.0
-wtforms==2.2.1
-wtforms_sqlalchemy>=0.3,<1.0
-sqlalchemy==1.3.15
-alembic==1.4.2
-jinja2==3.0.3
-blinker==1.4
-bsddb3==6.2.7
-werkzeug>=2.2.0,<3.0.0
-flask>=2.1.3,<3.0.0
-flask-login>=0.6.1,<1.0.0
+pytz>=2022.7.1,<2022.8.0
+psycopg2>=2.9.5,<2.10.0
+babel>=2.12.1,<2.13.0
+wtforms[email]>=3.0.0,<4.0.0
+wtforms_sqlalchemy>=0.3,<1.0.0
+sqlalchemy>=1.4.47,<2.0.0
+alembic>=1.10.2,<2.0.0
+jinja2>=3.1.2,<3.2.0
+blinker>=1.5,<1.6
+bsddb3>=6.2.9,<6.3.0
+werkzeug>=2.2.3,<3.0.0
+flask>=2.2.3,<3.0.0
+flask-login>=0.6.2,<1.0.0
 flask-mail>=0.9.1,<1.0.0
-flask-migrate>=3.1.0,<4.0.0
-flask-babel>=2.0.0,<3.0.0
+flask-migrate>=4.0.4,<5.0.0
+flask-babel>=3.0.1,<4.0.0
 flask-principal>=0.4.0,<1.0.0
-flask-wtf>=1.0.1,<1.1.0
+flask-wtf>=1.1.1,<2.0.0
 flask-script>=2.0.6,<3.0.0
 flask-sqlalchemy>=2.5.1,<3.0.0
 flask-debugtoolbar>=0.13.1,<1.0.0
 flask-jsglue>=0.3.1,<1.0.0
-dnspython==1.16.0
-geoip2==3.0.0
-maxminddb==1.5.2
-requests==2.23.0
-rrdtool==0.1.15
-pyyaml==5.3.1
+dnspython>=2.3.0,<3.0.0
+geoip2>=4.6.0,<5.0.0
+requests>=2.28.2,<3.0.0
+rrdtool>=0.1.16,<0.2
+pyyaml>=6.0.0,<7.0.0
 pydgets>=0.11,<1.0
-pyzenkit>=0.64,<1.0
-pynspect>=0.21,<1.0
-ipranges>=0.1.11,<1.0.0
-typedcols>=0.1.14,<1.0.0
-idea-format>=0.1.14,<1.0.0
-python-dateutil==2.8.1
-PyBabel-json-md==0.1.0
-itsdangerous>=2.1.2,<3.0.0
-
+pyzenkit>=0.65,<1.0
+pynspect>=0.22,<1.0
+ipranges>=0.1.12,<1.0.0
+typedcols>=0.1.15,<1.0.0
+idea-format>=0.1.15,<1.0.0
+python-dateutil>=2.8.1,<2.9.0
+PyBabel-json-md>=0.1.0,<0.2.0
+itsdangerous>=2.1.2,<2.2.0
-- 
GitLab