SNOW-132958 SNOW-104556 fixed merge conflict

Author: sfc-gh-stakeda

scripts/install.sh.rej

@@ -1,6 +1,6 @@
 [tox]
 envlist = fix_lint,
-          py{35,36,37,38}{-pandas,},
+          py{35,36,37}{-pandas,},
           coverage
 
 skipdist = true
@@ -64,3 +64,14 @@ extras = pandas, development
 usedevelop = True
 commands = python -m pip list --format=columns
            python -c "print(r'{envpython}')"
+
+[pytest]
+addopts = -ra
+junit_family=legacy
+
+[isort]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+line_length = 120
+known_third_party =conftest,mock,numpy,pandas,parameters,pytest,pytz,setuptools,six,snowflake,sqlalchemy