From a3c64a92f1300cfef1e89197bd46ec353bfcfe75 Mon Sep 17 00:00:00 2001 From: Harlan Lieberman-Berg Date: Thu, 9 Nov 2023 17:08:02 -0500 Subject: [PATCH] OD-1731: Update dependencies to modern versions This requires a change to the MySQL argument handling for the connect function, which now takes named arguments instead of positional arguments. --- requirements.txt | 34 +++++++++++++++++----------------- shared_python/Sql.py | 10 +++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements.txt b/requirements.txt index 95a72da..fd12516 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,20 @@ -PyMySQL==0.10.1 -Cython==0.29.21 -pyOpenSSL==19.1.0 -backports.functools_lru_cache==1.3 -certifi==2020.11.8 +PyMySQL==1.1.0 +Cython==3.0.5 +pyOpenSSL==23.3.0 +backports.functools_lru_cache==1.6.6 +certifi==2023.7.22 charade==1.0.3 -Genshi==0.7.5 +Genshi==0.7.7 ipaddr==2.2.0 -keyring==21.5.0 -lxml==4.6.5 -ndg_httpsclient==0.4.2 -pyasn1==0.4.8 -pytest==6.1.2 -setuptools_svn==1.2 +keyring==24.2.0 +lxml==4.9.3 +ndg_httpsclient==0.5.1 +pyasn1==0.5.0 +pytest==7.4.3 +setuptools_svn==1.3.0 wincertstore==0.2 -pyxdg==0.27 -pyyaml==5.4 -colorlog==4.2.1 -prompt_toolkit==3.0.38 -ruff==0.1.3 +pyxdg==0.28 +pyyaml==6.0.1 +colorlog==6.7.0 +prompt_toolkit==3.0.39 +ruff==0.1.5 diff --git a/shared_python/Sql.py b/shared_python/Sql.py index 1fef285..9a5227b 100755 --- a/shared_python/Sql.py +++ b/shared_python/Sql.py @@ -10,7 +10,7 @@ class Sql(object): def __init__(self, args, log): self.tag_count = 0 - conn = connect(args.db_host, args.db_user, args.db_password) + conn = connect(host=args.db_host, user=args.db_user, password=args.db_password) cursor = conn.cursor() cursor.execute( "CREATE DATABASE IF NOT EXISTS `{0}`".format(args.temp_db_database) @@ -18,10 +18,10 @@ def __init__(self, args, log): self.log = log self.conn = connect( - args.db_host, - args.db_user, - args.db_password, - args.temp_db_database, + host=args.db_host, + user=args.db_user, + password=args.db_password, + database=args.temp_db_database, charset="utf8", use_unicode=True, autocommit=True,