Update

Author: rzats

integrations/acquisition/covidcast/test_covidcast_meta_caching.py

@@ -5,7 +5,7 @@
 import unittest
 
 # third party
-import mysql.connector
+import MySQLdb
 import requests
 
 # first party
@@ -32,11 +32,11 @@ def setUp(self):
     """Perform per-test setup."""
 
     # connect to the `epidata` database
-    cnx = mysql.connector.connect(
+    cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',
-        database='covid')
+        db='covid')
     cur = cnx.cursor()
 
     # clear all tables
@@ -58,7 +58,7 @@ def setUp(self):
     secrets.db.host = 'delphi_database_epidata'
     secrets.db.epi = ('user', 'pass')
 
-    epidata_cnx = mysql.connector.connect(
+    epidata_cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',

integrations/acquisition/covidcast/test_csv_uploading.py

@@ -7,7 +7,7 @@
 import argparse
 
 # third party
-import mysql.connector
+import MySQLdb
 import pandas as pd
 import numpy as np
 
@@ -28,7 +28,7 @@ def setUp(self):
     """Perform per-test setup."""
 
     # connect to the `epidata` database and clear the `covidcast` table
-    cnx = mysql.connector.connect(
+    cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',
@@ -55,7 +55,7 @@ def setUp(self):
     secrets.db.host = 'delphi_database_epidata'
     secrets.db.epi = ('user', 'pass')
 
-    epidata_cnx = mysql.connector.connect(
+    epidata_cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',

integrations/server/test_covidcast.py

@@ -5,7 +5,7 @@
 import unittest
 
 # third party
-import mysql.connector
+import MySQLdb
 
 # first party
 from delphi_utils import Nans
@@ -369,7 +369,7 @@ def test_unique_key_constraint(self):
     row = self._insert_placeholder_set_one()
 
     # fail to insert different placeholder data under the same key
-    with self.assertRaises(mysql.connector.errors.IntegrityError):
+    with self.assertRaises(MySQLdb._exceptions.IntegrityError):
       self._insert_placeholder_set_one()
 
     # succeed to insert different placeholder data under a different time_type

integrations/server/test_covidcast_meta.py

@@ -4,7 +4,7 @@
 import unittest
 
 # third party
-import mysql.connector
+import MySQLdb
 import requests
 
 #first party
@@ -53,7 +53,7 @@ def localSetUp(self):
     """Perform per-test setup."""
 
     # connect to the `epidata` database and clear the `covidcast` table
-    cnx = mysql.connector.connect(
+    cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',

integrations/server/test_fluview.py

@@ -4,7 +4,7 @@
 import unittest
 
 # third party
-import mysql.connector
+import MySQLdb
 
 # first party
 from delphi.epidata.client.delphi_epidata import Epidata
@@ -25,7 +25,7 @@ def setUp(self):
     """Perform per-test setup."""
 
     # connect to the `epidata` database and clear the `fluview` table
-    cnx = mysql.connector.connect(
+    cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',

integrations/server/test_fluview_meta.py

@@ -4,7 +4,7 @@
 import unittest
 
 # third party
-import mysql.connector
+import MySQLdb
 
 # first party
 from delphi.epidata.client.delphi_epidata import Epidata
@@ -25,7 +25,7 @@ def setUp(self):
     """Perform per-test setup."""
 
     # connect to the `epidata` database and clear the `fluview` table
-    cnx = mysql.connector.connect(
+    cnx = MySQLdb.connect(
         user='user',
         password='pass',
         host='delphi_database_epidata',

requirements.api.txt

@@ -13,7 +13,7 @@ redis==3.5.3
 requests==2.31.0
 scipy==1.10.0
 sentry-sdk[flask]
-SQLAlchemy==1.4.40
+SQLAlchemy==1.4.51
 structlog==22.1.0
 tenacity==7.0.0
 typing-extensions

requirements.dev.txt

@@ -10,10 +10,8 @@ invoke>=1.4.1
 lxml==4.9.1
 matplotlib==3.6.2
 mypy>=0.790
-mysql-connector-python==8.2.0
 numpy==1.22.4
 pycountry==22.3.5
-pymysql==1.1.0
 pytest==7.2.0
 pytest-check==1.3.0
 sas7bdat==2.2.3

src/acquisition/cdcp/cdc_dropbox_receiver.py

@@ -22,7 +22,7 @@
 
 # third party
 import dropbox
-import mysql.connector
+import MySQLdb
 
 # first party
 import delphi.operations.secrets as secrets
@@ -47,7 +47,7 @@ def trigger_further_processing():
 
     # connect
     u, p = secrets.db.auto
-    cnx = mysql.connector.connect(user=u, password=p, database="automation")
+    cnx = MySQLdb.connect(user=u, password=p, database="automation")
     cur = cnx.cursor()
 
     # add step "Process CDCP Data" to queue

src/acquisition/cdcp/cdc_extract.py

@@ -66,7 +66,7 @@
 import sys
 
 # third party
-import mysql.connector
+import MySQLdb
 
 # first party
 import delphi.operations.secrets as secrets
@@ -154,7 +154,7 @@ def extract(first_week=None, last_week=None, test_mode=False):
 
     # connect
     u, p = secrets.db.epi
-    cnx = mysql.connector.connect(user=u, password=p, database="epidata")
+    cnx = MySQLdb.connect(user=u, password=p, database="epidata")
     cur = cnx.cursor()
 
     # weeks to update