Resolve setup.cfg merge conflict

Author: saska

ci/setup_env.sh

@@ -55,6 +55,7 @@ echo
 echo "update conda"
 conda config --set ssl_verify false
 conda config --set quiet true --set always_yes true --set changeps1 false
+conda install pip  # create conda to create a historical artifact for pip & setuptools
 conda update -n base conda
 
 echo "conda info -a"

pandas/tests/io/test_sql.py

@@ -583,7 +583,7 @@ class _TestSQLApi(PandasSQLTest):
     """
 
     flavor = "sqlite"
-    mode = None
+    mode = None  # type: str
 
     def setup_connect(self):
         self.conn = self.connect()
@@ -1234,7 +1234,7 @@ class _TestSQLAlchemy(SQLAlchemyMixIn, PandasSQLTest):
 
     """
 
-    flavor = None
+    flavor = None  # type: str
 
     @pytest.fixture(autouse=True, scope="class")
     def setup_class(cls):