fix: dependence bugs and cleanup

* pandas[excel]<2 doesn't work, go back to xlrd and comment
* add mock to changehc
* add requests

Author: dshemetov

_delphi_utils_python/pyproject.toml

@@ -8,12 +8,12 @@ version = "0.3.24"
 description = "Shared Utility Functions for Indicators"
 readme = "README.md"
 requires-python = "== 3.8.*"
-license = {text = "MIT License"}
+license = { text = "MIT License" }
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3.8",
-    "License :: MIT"
+    "License :: MIT",
 ]
 dependencies = [
     "boto3",
@@ -23,16 +23,17 @@ dependencies = [
     "gitpython",
     "importlib_resources>=1.3",
     "numpy",
-    "pandas[excel]>=1.1.0",
+    "pandas>=1.1.0",
+    "requests",
     "slackclient",
-    "scs<3.2.6", # TODO: remove this ; it is a cvxpy dependency, and the excluded version appears to break our jenkins build. see: https://github.com/cvxgrp/scs/issues/283
+    "scs<3.2.6",                # TODO: remove this ; it is a cvxpy dependency, and the excluded version appears to break our jenkins build. see: https://github.com/cvxgrp/scs/issues/283
     "structlog",
+    "xlrd",                     # needed by Pandas to read Excel files
 ]
 
 [project.urls]
 Homepage = "https://github.com/cmu-delphi/covidcast-indicators"
 
-
 [project.optional-dependencies]
 dev = [
     "darker[isort]~=2.1.1",
@@ -45,7 +46,7 @@ dev = [
     "requests-mock",
     "freezegun",
 ]
-
+flash = ["scipy"]
 
 [tool.setuptools.packages.find]
 where = ["."]
@@ -54,6 +55,3 @@ namespaces = true
 
 [tool.setuptools.package-data]
 "delphi_utils.data" = ["20*/*.csv"]
-
-
-

_template_python/pyproject.toml

@@ -4,23 +4,21 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "delphi_NAME"
-version = "0.3.24"
-description = "HORT DESCRIPTION"
+version = "0.1.0"
+description = "SHORT DESCRIPTION"
 readme = "README.md"
 requires-python = "== 3.8.*"
-license = {text = "MIT License"}
+license = { text = "MIT License" }
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3.8",
-    "License :: MIT"
+    "License :: MIT",
 ]
-
 dependencies = [
-    "covidcast",
     "delphi-utils",
     "numpy",
-    "pandas[excel]>=1.1.0",
+    "pandas>=1.1.0",
 ]
 
 [project.urls]
@@ -39,10 +37,6 @@ dev = [
     "freezegun",
 ]
 
-
 [tool.setuptools.packages.find]
 where = ["."]
 namespaces = true
-
-
-

changehc/setup.py

@@ -6,6 +6,7 @@
     "covidcast",
     "darker[isort]~=2.1.1",
     "delphi-utils",
+    "mock",
     "moto~=4.2.14",
     "numpy",
     "pandas",

quidel_covidtest/setup.py

@@ -15,7 +15,7 @@
     "pylint==2.8.3",
     "pytest-cov",
     "pytest",
-    "xlrd==1.2.0",
+    "xlrd==1.2.0", # needed by Pandas to read Excel files
 ]
 
 setup(