From 69571ef2cbb1788915fb00d1ce5a3ae4a931b6b9 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Mon, 1 Jul 2024 15:22:13 -0400
Subject: [PATCH 01/24] add pyproject.toml

---
 _delphi_utils_python/pyproject.toml | 59 +++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 _delphi_utils_python/pyproject.toml

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
new file mode 100644
index 000000000..3306f39db
--- /dev/null
+++ b/_delphi_utils_python/pyproject.toml
@@ -0,0 +1,59 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "delphi-utils"
+version = "0.3.23"
+description = "Shared Utility Functions for Indicators"
+readme = "README.md"
+license = "MIT"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3.8",
+    "License :: MIT"
+]
+dependencies = [
+    "boto3",
+    "covidcast",
+    "cvxpy",
+    "epiweeks",
+    "gitpython",
+    "importlib_resources>=1.3",
+    "numpy",
+    "pandas>=1.1.0",
+    "slackclient",
+    "structlog",
+    "xlrd",
+]
+
+[project.urls]
+Homepage = "https://github.com/cmu-delphi/"
+
+
+[project.optional-dependencies]
+dev = [
+    "darker[isort]~=2.1.1",
+    "pylint==2.8.3",
+    "pytest",
+    "pydocstyle",
+    "pytest-cov",
+    "mock",
+    "moto~=4.2.14",
+    "requests-mock",
+    "freezegun",
+]
+
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["delphi_utils"]
+namespaces = true
+
+[tool.setuptools.package-data]
+"delphi_utils.data" = ["*"]
+recipe = ["*.csv"]
+
+
+

From 793634037e582fef2b378e1cd4fbba82165d1b7d Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Tue, 2 Jul 2024 09:35:41 -0400
Subject: [PATCH 02/24] made changes based on suggestion

---
 _delphi_utils_python/.bumpversion.cfg |  2 +-
 _delphi_utils_python/DEVELOP.md       |  2 +-
 _delphi_utils_python/Makefile         |  8 ++---
 _delphi_utils_python/pyproject.toml   |  5 +--
 _delphi_utils_python/setup.py         | 48 ---------------------------
 5 files changed, 9 insertions(+), 56 deletions(-)
 delete mode 100644 _delphi_utils_python/setup.py

diff --git a/_delphi_utils_python/.bumpversion.cfg b/_delphi_utils_python/.bumpversion.cfg
index 722a91e30..af22c56eb 100644
--- a/_delphi_utils_python/.bumpversion.cfg
+++ b/_delphi_utils_python/.bumpversion.cfg
@@ -4,6 +4,6 @@ commit = True
 message = chore: bump delphi_utils to {new_version}
 tag = False
 
-[bumpversion:file:setup.py]
+[bumpversion:file:pyproject.toml]
 
 [bumpversion:file:delphi_utils/__init__.py]
diff --git a/_delphi_utils_python/DEVELOP.md b/_delphi_utils_python/DEVELOP.md
index 2407e29a8..53ffde93f 100644
--- a/_delphi_utils_python/DEVELOP.md
+++ b/_delphi_utils_python/DEVELOP.md
@@ -9,7 +9,7 @@ To install the module in your default version of Python, run the
 following from this directory:
 
 ```
-pip install .
+pip install -e '.[dev]'
 ```
 
 As described in each of the indicator code directories, you will want to install
diff --git a/_delphi_utils_python/Makefile b/_delphi_utils_python/Makefile
index 79d7f7943..02b05b0bd 100644
--- a/_delphi_utils_python/Makefile
+++ b/_delphi_utils_python/Makefile
@@ -6,12 +6,11 @@ venv:
 install: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install -e .
+	pip install -e '.[dev]'
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
-	pip install .
+	pip install 'build[virtualenv]' pylint pytest pydocstyle wheel twine
 
 lint:
 	. env/bin/activate; pylint delphi_utils --rcfile=../pyproject.toml
@@ -30,4 +29,5 @@ clean:
 
 release: lint test
 	. env/bin/activate ; \
-	python setup.py sdist bdist_wheel
+	pip install 'build[virtualenv]' ; \
+    python -m build --sdist --wheel
\ No newline at end of file
diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index 3306f39db..368518c1b 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -7,7 +7,8 @@ name = "delphi-utils"
 version = "0.3.23"
 description = "Shared Utility Functions for Indicators"
 readme = "README.md"
-license = "MIT"
+requires-python = "== 3.8.*"
+license = {text = "MIT License"}
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
@@ -29,7 +30,7 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/cmu-delphi/"
+Homepage = "https://github.com/cmu-delphi/covidcast-indicators"
 
 
 [project.optional-dependencies]
diff --git a/_delphi_utils_python/setup.py b/_delphi_utils_python/setup.py
deleted file mode 100644
index 3dee89b53..000000000
--- a/_delphi_utils_python/setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from setuptools import setup
-from setuptools import find_packages
-
-with open("README.md", "r") as f:
-    long_description = f.read()
-
-required = [
-    "boto3",
-    "covidcast",
-    "cvxpy",
-    "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
-    "darker[isort]~=2.1.1",
-    "epiweeks",
-    "freezegun",
-    "gitpython",
-    "importlib_resources>=1.3",
-    "mock",
-    "moto~=4.2.14",
-    "numpy",
-    "pandas>=1.1.0",
-    "pydocstyle",
-    "pylint==2.8.3",
-    "pytest-cov",
-    "pytest",
-    "requests-mock",
-    "slackclient",
-    "structlog",
-    "xlrd"
-]
-
-setup(
-    name="delphi_utils",
-    version="0.3.24",
-    description="Shared Utility Functions for Indicators",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    author="",
-    author_email="",
-    url="https://github.com/cmu-delphi/",
-    install_requires=required,
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Programming Language :: Python :: 3.8",
-    ],
-    packages=find_packages(),
-    package_data={'': ['data/20*/*.csv']}
-)

From 341f3b1c5b5ae33cf88f765b17ce346814e7bc58 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Tue, 2 Jul 2024 09:36:33 -0400
Subject: [PATCH 03/24] update ci config

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 3e1ee9689..6e23c61d2 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           python-version: 3.8
           cache: "pip"
-          cache-dependency-path: "setup.py"
+          cache-dependency-path: "pyproject.toml"
       - name: Install testing dependencies
         run: |
           python -m pip install --upgrade pip

From 4a5849219cbef50122fb3eff239840fc308fbf7e Mon Sep 17 00:00:00 2001
From: aysim319 <aysim319@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:04:32 -0400
Subject: [PATCH 04/24] separate new line

Co-authored-by: Dmitry Shemetov <dshemetov@ucdavis.edu>
---
 _delphi_utils_python/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_delphi_utils_python/Makefile b/_delphi_utils_python/Makefile
index 02b05b0bd..4249528d9 100644
--- a/_delphi_utils_python/Makefile
+++ b/_delphi_utils_python/Makefile
@@ -10,7 +10,8 @@ install: venv
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install 'build[virtualenv]' pylint pytest pydocstyle wheel twine
+	pip install 'build[virtualenv]' pylint pytest pydocstyle wheel twine ; \
+	pip install '.[dev]'
 
 lint:
 	. env/bin/activate; pylint delphi_utils --rcfile=../pyproject.toml

From cbc7453514427a5d1b9e2be1934aee66de90f904 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Mon, 8 Jul 2024 12:31:45 -0700
Subject: [PATCH 05/24] fix: add explicit boto and moto dependencies to
 indicators

---
 nchs_mortality/setup.py   | 2 ++
 quidel_covidtest/setup.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/nchs_mortality/setup.py b/nchs_mortality/setup.py
index 3fe354ba4..142db6f35 100644
--- a/nchs_mortality/setup.py
+++ b/nchs_mortality/setup.py
@@ -2,10 +2,12 @@
 from setuptools import find_packages
 
 required = [
+    "boto3",
     "darker[isort]~=2.1.1",
     "delphi-utils",
     "epiweeks",
     "freezegun",
+    "moto~=4.2.14",
     "numpy",
     "pandas",
     "pydocstyle",
diff --git a/quidel_covidtest/setup.py b/quidel_covidtest/setup.py
index c2791930f..c579da79e 100644
--- a/quidel_covidtest/setup.py
+++ b/quidel_covidtest/setup.py
@@ -2,6 +2,7 @@
 from setuptools import find_packages
 
 required = [
+    "boto3",
     "covidcast",
     "darker[isort]~=2.1.1",
     "delphi-utils",

From d88dba1e3bff8e03153d4cc29354632df574d679 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Mon, 8 Jul 2024 18:29:18 -0400
Subject: [PATCH 06/24] trying to get package data to show

---
 _delphi_utils_python/pyproject.toml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index 368518c1b..415a2efea 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools", "setuptools-scm>=8.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -53,8 +53,7 @@ include = ["delphi_utils"]
 namespaces = true
 
 [tool.setuptools.package-data]
-"delphi_utils.data" = ["*"]
-recipe = ["*.csv"]
+"delphi_utils.data" = ["20*/*.csv"]
 
 
 

From 46496ce52c7960eb20f8d727d23f9ac8edc54861 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Mon, 22 Jul 2024 10:35:52 -0400
Subject: [PATCH 07/24] installing dev package before testing in ci

---
 changehc/Makefile          | 2 +-
 claims_hosp/Makefile       | 2 +-
 doctor_visits/Makefile     | 2 +-
 google_symptoms/Makefile   | 2 +-
 hhs_hosp/Makefile          | 2 +-
 nchs_mortality/Makefile    | 2 +-
 nssp/Makefile              | 2 +-
 nwss_wastewater/Makefile   | 2 +-
 quidel_covidtest/Makefile  | 2 +-
 sir_complainsalot/Makefile | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/changehc/Makefile b/changehc/Makefile
index 390113eef..1934c9864 100644
--- a/changehc/Makefile
+++ b/changehc/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/claims_hosp/Makefile b/claims_hosp/Makefile
index 390113eef..1934c9864 100644
--- a/claims_hosp/Makefile
+++ b/claims_hosp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/doctor_visits/Makefile b/doctor_visits/Makefile
index 390113eef..1934c9864 100644
--- a/doctor_visits/Makefile
+++ b/doctor_visits/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/google_symptoms/Makefile b/google_symptoms/Makefile
index 6884278cf..15c428849 100644
--- a/google_symptoms/Makefile
+++ b/google_symptoms/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/hhs_hosp/Makefile b/hhs_hosp/Makefile
index 69529feb7..5ae0527d7 100644
--- a/hhs_hosp/Makefile
+++ b/hhs_hosp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/nchs_mortality/Makefile b/nchs_mortality/Makefile
index 390113eef..1934c9864 100644
--- a/nchs_mortality/Makefile
+++ b/nchs_mortality/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/nssp/Makefile b/nssp/Makefile
index 390113eef..1934c9864 100644
--- a/nssp/Makefile
+++ b/nssp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/nwss_wastewater/Makefile b/nwss_wastewater/Makefile
index 390113eef..1934c9864 100644
--- a/nwss_wastewater/Makefile
+++ b/nwss_wastewater/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/quidel_covidtest/Makefile b/quidel_covidtest/Makefile
index 390113eef..1934c9864 100644
--- a/quidel_covidtest/Makefile
+++ b/quidel_covidtest/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:
diff --git a/sir_complainsalot/Makefile b/sir_complainsalot/Makefile
index 390113eef..1934c9864 100644
--- a/sir_complainsalot/Makefile
+++ b/sir_complainsalot/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install ../_delphi_utils_python ;\
+	pip install '../_delphi_utils_python[dev]' ;\
 	pip install .
 
 lint:

From 4129c98519fceec89b67d9a3777968cd9d35310a Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Mon, 22 Jul 2024 14:37:14 -0400
Subject: [PATCH 08/24] adding dependency

---
 _delphi_utils_python/pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index 415a2efea..b9c10fe0c 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -18,13 +18,14 @@ classifiers = [
 dependencies = [
     "boto3",
     "covidcast",
-    "cvxpy",
+    "cvxpy", # 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
     "epiweeks",
     "gitpython",
     "importlib_resources>=1.3",
     "numpy",
     "pandas>=1.1.0",
     "slackclient",
+    "scs<3.2.6",
     "structlog",
     "xlrd",
 ]

From c920b55845fa172c1c187ae9440f111c23a02849 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Mon, 22 Jul 2024 15:02:06 -0400
Subject: [PATCH 09/24] move comment to right package

---
 _delphi_utils_python/pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index b9c10fe0c..ad4340695 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -18,14 +18,14 @@ classifiers = [
 dependencies = [
     "boto3",
     "covidcast",
-    "cvxpy", # 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
+    "cvxpy",
     "epiweeks",
     "gitpython",
     "importlib_resources>=1.3",
     "numpy",
     "pandas>=1.1.0",
     "slackclient",
-    "scs<3.2.6",
+    "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",
 ]

From 068d4d0926927ec7c27dfa394bb5182668783505 Mon Sep 17 00:00:00 2001
From: aysim319 <aysim319@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:31:42 -0400
Subject: [PATCH 10/24] Update _delphi_utils_python/pyproject.toml

Co-authored-by: Dmitry Shemetov <dshemetov@ucdavis.edu>
---
 _delphi_utils_python/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index ad4340695..6ca3d98b7 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "delphi-utils"
-version = "0.3.23"
+version = "0.3.24"
 description = "Shared Utility Functions for Indicators"
 readme = "README.md"
 requires-python = "== 3.8.*"

From b80b3eae56ed8546a3af4b2adf5f5f1d7c6bb9ef Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Wed, 7 Aug 2024 11:36:12 -0400
Subject: [PATCH 11/24] more suggestion

---
 _delphi_utils_python/pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index 6ca3d98b7..ab2e9f097 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -23,11 +23,10 @@ dependencies = [
     "gitpython",
     "importlib_resources>=1.3",
     "numpy",
-    "pandas>=1.1.0",
+    "pandas[excel]>=1.1.0",
     "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
     "structlog",
-    "xlrd",
 ]
 
 [project.urls]

From 9fd531e447bed36851beba42c198c69fc9dd1344 Mon Sep 17 00:00:00 2001
From: Amaris Sim <aysim319@gmail.com>
Date: Wed, 7 Aug 2024 11:42:14 -0400
Subject: [PATCH 12/24] adding pyproject.toml to template

---
 _template_python/pyproject.toml | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 _template_python/pyproject.toml

diff --git a/_template_python/pyproject.toml b/_template_python/pyproject.toml
new file mode 100644
index 000000000..b4a073fc3
--- /dev/null
+++ b/_template_python/pyproject.toml
@@ -0,0 +1,48 @@
+[build-system]
+requires = ["setuptools", "setuptools-scm>=8.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "delphi_NAME"
+version = "0.3.24"
+description = "HORT DESCRIPTION"
+readme = "README.md"
+requires-python = "== 3.8.*"
+license = {text = "MIT License"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3.8",
+    "License :: MIT"
+]
+
+dependencies = [
+    "covidcast",
+    "delphi-utils",
+    "numpy",
+    "pandas[excel]>=1.1.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/cmu-delphi/covidcast-indicators"
+
+[project.optional-dependencies]
+dev = [
+    "darker[isort]~=2.1.1",
+    "pylint==2.8.3",
+    "pytest",
+    "pydocstyle",
+    "pytest-cov",
+    "mock",
+    "moto~=4.2.14",
+    "requests-mock",
+    "freezegun",
+]
+
+
+[tool.setuptools.packages.find]
+where = ["."]
+namespaces = true
+
+
+

From 755b6718900ddcfead40ee477994b35a5e895435 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:04 -0700
Subject: [PATCH 13/24] Update changehc/Makefile

---
 changehc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changehc/Makefile b/changehc/Makefile
index 1934c9864..390113eef 100644
--- a/changehc/Makefile
+++ b/changehc/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 8f35aadb7e991d1678cb37872f345d94055a56da Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:11 -0700
Subject: [PATCH 14/24] Update claims_hosp/Makefile

---
 claims_hosp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/claims_hosp/Makefile b/claims_hosp/Makefile
index 1934c9864..390113eef 100644
--- a/claims_hosp/Makefile
+++ b/claims_hosp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From bff5bb8d9984d5f228e5f11765a4f910983d4230 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:16 -0700
Subject: [PATCH 15/24] Update doctor_visits/Makefile

---
 doctor_visits/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doctor_visits/Makefile b/doctor_visits/Makefile
index 1934c9864..390113eef 100644
--- a/doctor_visits/Makefile
+++ b/doctor_visits/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 1e1ccaf5623cfea88232366cab03f2bf12ad3cef Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:22 -0700
Subject: [PATCH 16/24] Update google_symptoms/Makefile

---
 google_symptoms/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google_symptoms/Makefile b/google_symptoms/Makefile
index 15c428849..6884278cf 100644
--- a/google_symptoms/Makefile
+++ b/google_symptoms/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From e95b5d70e95cd73df8b52fd9af7f74f71c735491 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:27 -0700
Subject: [PATCH 17/24] Update hhs_hosp/Makefile

---
 hhs_hosp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hhs_hosp/Makefile b/hhs_hosp/Makefile
index 5ae0527d7..69529feb7 100644
--- a/hhs_hosp/Makefile
+++ b/hhs_hosp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 4bc32d86aa4d69ccf33d84382756c97334209e94 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:34 -0700
Subject: [PATCH 18/24] Update nchs_mortality/Makefile

---
 nchs_mortality/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nchs_mortality/Makefile b/nchs_mortality/Makefile
index 1934c9864..390113eef 100644
--- a/nchs_mortality/Makefile
+++ b/nchs_mortality/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 1d8b1d49d2cf3e13032f3a61c5d0310ebee1c325 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:42 -0700
Subject: [PATCH 19/24] Update nssp/Makefile

---
 nssp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nssp/Makefile b/nssp/Makefile
index 1934c9864..390113eef 100644
--- a/nssp/Makefile
+++ b/nssp/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From cd44d90e7f7af1785707e1e24db9068abc868a58 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:47 -0700
Subject: [PATCH 20/24] Update nwss_wastewater/Makefile

---
 nwss_wastewater/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nwss_wastewater/Makefile b/nwss_wastewater/Makefile
index 1934c9864..390113eef 100644
--- a/nwss_wastewater/Makefile
+++ b/nwss_wastewater/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From c2fdae5555f7d50cc578cf5fbdbdf3cd2aac662f Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:42:53 -0700
Subject: [PATCH 21/24] Update quidel_covidtest/Makefile

---
 quidel_covidtest/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quidel_covidtest/Makefile b/quidel_covidtest/Makefile
index 1934c9864..390113eef 100644
--- a/quidel_covidtest/Makefile
+++ b/quidel_covidtest/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 45cfd8fbbf8671caa70fcc3f96226c787cd776c8 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 10:43:02 -0700
Subject: [PATCH 22/24] Update sir_complainsalot/Makefile

---
 sir_complainsalot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sir_complainsalot/Makefile b/sir_complainsalot/Makefile
index 1934c9864..390113eef 100644
--- a/sir_complainsalot/Makefile
+++ b/sir_complainsalot/Makefile
@@ -13,7 +13,7 @@ install: venv
 install-ci: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install '../_delphi_utils_python[dev]' ;\
+	pip install ../_delphi_utils_python ;\
 	pip install .
 
 lint:

From 46ef13bcb392ef4bae1614d8cf93678ffd250ee0 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 8 Aug 2024 12:03:43 -0700
Subject: [PATCH 23/24] fix: dependence bugs and cleanup * pandas[excel]<2
 doesn't work, go back to xlrd and comment * add mock to changehc * add
 requests * remove setup.py from template

---
 _delphi_utils_python/Makefile       |  2 +-
 _delphi_utils_python/pyproject.toml | 16 +++++++--------
 _template_python/pyproject.toml     | 16 +++++----------
 _template_python/setup.py           | 30 -----------------------------
 changehc/setup.py                   |  1 +
 quidel_covidtest/setup.py           |  2 +-
 6 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 _template_python/setup.py

diff --git a/_delphi_utils_python/Makefile b/_delphi_utils_python/Makefile
index 4249528d9..60f7d2af0 100644
--- a/_delphi_utils_python/Makefile
+++ b/_delphi_utils_python/Makefile
@@ -31,4 +31,4 @@ clean:
 release: lint test
 	. env/bin/activate ; \
 	pip install 'build[virtualenv]' ; \
-    python -m build --sdist --wheel
\ No newline at end of file
+	python -m build --sdist --wheel
\ No newline at end of file
diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index ab2e9f097..d6480baf0 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_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"]
-
-
-
diff --git a/_template_python/pyproject.toml b/_template_python/pyproject.toml
index b4a073fc3..c29d9650e 100644
--- a/_template_python/pyproject.toml
+++ b/_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
-
-
-
diff --git a/_template_python/setup.py b/_template_python/setup.py
deleted file mode 100644
index d7bc44078..000000000
--- a/_template_python/setup.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from setuptools import setup
-from setuptools import find_packages
-
-required = [
-    "covidcast",
-    "darker[isort]~=2.1.1",
-    "delphi-utils",
-    "numpy",
-    "pandas",
-    "pydocstyle",
-    "pylint==2.8.3",
-    "pytest-cov",
-    "pytest",
-]
-
-setup(
-    name="delphi_NAME",
-    version="0.1.0",
-    description="SHORT DESCRIPTION",
-    author="",
-    author_email="",
-    url="https://github.com/cmu-delphi/covidcast-indicators",
-    install_requires=required,
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Programming Language :: Python :: 3.8",
-    ],
-    packages=find_packages(),
-)
diff --git a/changehc/setup.py b/changehc/setup.py
index d95beb771..f386e9613 100644
--- a/changehc/setup.py
+++ b/changehc/setup.py
@@ -6,6 +6,7 @@
     "covidcast",
     "darker[isort]~=2.1.1",
     "delphi-utils",
+    "mock",
     "moto~=4.2.14",
     "numpy",
     "pandas",
diff --git a/quidel_covidtest/setup.py b/quidel_covidtest/setup.py
index c579da79e..82c80832a 100644
--- a/quidel_covidtest/setup.py
+++ b/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(

From 8a72ca0b7a753949df703b57d429038b7e1ed74c Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Fri, 9 Aug 2024 10:00:30 -0700
Subject: [PATCH 24/24] build+ci+jenkins: make local, ci, and deploy envs
 identical * pin pip==23.0.1 everywhere * remove pip install calls from ci and
 deploy,   make sure all dependencies are listed in   pyproject.toml or
 setup.py and installed by the   Makefile * remove wheel from dependencies,
 only needed   wheel for bdist_wheel command, which   setuptools>=70.1
 provides

---
 .github/workflows/publish-release.yml | 6 +-----
 .github/workflows/python-ci.yml       | 4 ----
 _delphi_utils_python/Makefile         | 9 ++++-----
 _delphi_utils_python/pyproject.toml   | 4 +++-
 _template_python/Makefile             | 6 +++---
 backfill_corrections/Makefile         | 2 +-
 changehc/Makefile                     | 6 +++---
 claims_hosp/Makefile                  | 6 +++---
 claims_hosp/setup.py                  | 1 +
 doctor_visits/Makefile                | 6 +++---
 doctor_visits/setup.py                | 1 +
 google_symptoms/Makefile              | 6 +++---
 google_symptoms/setup.py              | 1 +
 hhs_hosp/Makefile                     | 6 +++---
 jenkins/build-indicator.sh            | 5 ++---
 nchs_mortality/Makefile               | 6 +++---
 nssp/Makefile                         | 6 +++---
 nwss_wastewater/Makefile              | 6 +++---
 quidel_covidtest/Makefile             | 6 +++---
 sir_complainsalot/Makefile            | 6 +++---
 sir_complainsalot/setup.py            | 1 +
 21 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index a9f1ccae9..c30294f91 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -56,7 +56,7 @@ jobs:
         if: ${{ steps.changes.outputs.utils == 'true' }}
         run: git tag delphi-utils/v${{ steps.utils.outputs.version }}
       - name: Publish tags
-        run: git push --tags 
+        run: git push --tags
     outputs:
       indicators-version: ${{ steps.indicators.outputs.version }}
       utils-version: ${{ steps.utils.outputs.version }}
@@ -76,10 +76,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - name: Install testing dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pylint pytest pydocstyle wheel twine
       - name: Install
         run: |
           make install
diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 6e23c61d2..8f5a733ae 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -52,10 +52,6 @@ jobs:
           python-version: 3.8
           cache: "pip"
           cache-dependency-path: "pyproject.toml"
-      - name: Install testing dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pylint pytest pydocstyle wheel
       - name: Install
         run: |
           make install-ci
diff --git a/_delphi_utils_python/Makefile b/_delphi_utils_python/Makefile
index 60f7d2af0..6aa241e96 100644
--- a/_delphi_utils_python/Makefile
+++ b/_delphi_utils_python/Makefile
@@ -1,16 +1,16 @@
 .PHONY = venv, lint, test, clean, release
 
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e '.[dev]'
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install 'build[virtualenv]' pylint pytest pydocstyle wheel twine ; \
 	pip install '.[dev]'
 
 lint:
@@ -30,5 +30,4 @@ clean:
 
 release: lint test
 	. env/bin/activate ; \
-	pip install 'build[virtualenv]' ; \
-	python -m build --sdist --wheel
\ No newline at end of file
+	python -m build --sdist --wheel
diff --git a/_delphi_utils_python/pyproject.toml b/_delphi_utils_python/pyproject.toml
index d6480baf0..c72f4fb83 100644
--- a/_delphi_utils_python/pyproject.toml
+++ b/_delphi_utils_python/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm>=8.0"]
+requires = ["setuptools>=70.1", "setuptools-scm>=8.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -36,6 +36,7 @@ Homepage = "https://github.com/cmu-delphi/covidcast-indicators"
 
 [project.optional-dependencies]
 dev = [
+    "build[virtualenv]",
     "darker[isort]~=2.1.1",
     "pylint==2.8.3",
     "pytest",
@@ -45,6 +46,7 @@ dev = [
     "moto~=4.2.14",
     "requests-mock",
     "freezegun",
+    "twine"
 ]
 flash = ["scipy"]
 
diff --git a/_template_python/Makefile b/_template_python/Makefile
index 390113eef..b34394efb 100644
--- a/_template_python/Makefile
+++ b/_template_python/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/backfill_corrections/Makefile b/backfill_corrections/Makefile
index d479237be..ba0321734 100644
--- a/backfill_corrections/Makefile
+++ b/backfill_corrections/Makefile
@@ -56,7 +56,7 @@ install-python:
 	fi
 	python3 -m venv env
 	source env/bin/activate && \
-	python -m pip install --upgrade pip && \
+	python -m pip install pip==23.0.1 && \
 	pip install wheel && \
 	pip install --timeout 1000 delphi_utils
 
diff --git a/changehc/Makefile b/changehc/Makefile
index 390113eef..b34394efb 100644
--- a/changehc/Makefile
+++ b/changehc/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/claims_hosp/Makefile b/claims_hosp/Makefile
index 390113eef..b34394efb 100644
--- a/claims_hosp/Makefile
+++ b/claims_hosp/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/claims_hosp/setup.py b/claims_hosp/setup.py
index 3b859c294..5eb23cabb 100644
--- a/claims_hosp/setup.py
+++ b/claims_hosp/setup.py
@@ -6,6 +6,7 @@
     "darker[isort]~=2.1.1",
     "delphi-utils",
     "numpy",
+    "pydocstyle",
     "pandas",
     "paramiko",
     "pyarrow",
diff --git a/doctor_visits/Makefile b/doctor_visits/Makefile
index 390113eef..b34394efb 100644
--- a/doctor_visits/Makefile
+++ b/doctor_visits/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/doctor_visits/setup.py b/doctor_visits/setup.py
index 17d6fc9af..e224b5d8e 100644
--- a/doctor_visits/setup.py
+++ b/doctor_visits/setup.py
@@ -5,6 +5,7 @@
     "darker[isort]~=2.1.1",
     "delphi-utils",
     "numpy",
+    "pydocstyle",
     "pandas",
     "paramiko",
     "pylint==2.8.3",
diff --git a/google_symptoms/Makefile b/google_symptoms/Makefile
index 6884278cf..62897971e 100644
--- a/google_symptoms/Makefile
+++ b/google_symptoms/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/google_symptoms/setup.py b/google_symptoms/setup.py
index ccba3c47a..56621942f 100644
--- a/google_symptoms/setup.py
+++ b/google_symptoms/setup.py
@@ -8,6 +8,7 @@
     "freezegun",
     "mock",
     "numpy",
+    "pydocstyle",
     "pandas-gbq",
     "pandas",
     "pydocstyle",
diff --git a/hhs_hosp/Makefile b/hhs_hosp/Makefile
index 69529feb7..ca84eb7e6 100644
--- a/hhs_hosp/Makefile
+++ b/hhs_hosp/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/jenkins/build-indicator.sh b/jenkins/build-indicator.sh
index 3d2315741..3b8e3338a 100755
--- a/jenkins/build-indicator.sh
+++ b/jenkins/build-indicator.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Jenkins build 
+# Jenkins build
 #
 
 set -eo pipefail
@@ -14,7 +14,6 @@ cd "${WORKSPACE}/${local_indicator}" || exit
 # Set up venv
 python -m venv env
 source env/bin/activate
-pip install pip==23.0.1 --retries 10 --timeout 20
-pip install numpy --retries 10 --timeout 20
+python -m pip install pip==23.0.1 --retries 10 --timeout 20
 pip install ../_delphi_utils_python/. --retries 10 --timeout 20
 [ ! -f setup.py ] || pip install . --retries 10 --timeout 20
diff --git a/nchs_mortality/Makefile b/nchs_mortality/Makefile
index 390113eef..b34394efb 100644
--- a/nchs_mortality/Makefile
+++ b/nchs_mortality/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/nssp/Makefile b/nssp/Makefile
index 390113eef..b34394efb 100644
--- a/nssp/Makefile
+++ b/nssp/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/nwss_wastewater/Makefile b/nwss_wastewater/Makefile
index 390113eef..b34394efb 100644
--- a/nwss_wastewater/Makefile
+++ b/nwss_wastewater/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/quidel_covidtest/Makefile b/quidel_covidtest/Makefile
index 390113eef..b34394efb 100644
--- a/quidel_covidtest/Makefile
+++ b/quidel_covidtest/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/sir_complainsalot/Makefile b/sir_complainsalot/Makefile
index 390113eef..b34394efb 100644
--- a/sir_complainsalot/Makefile
+++ b/sir_complainsalot/Makefile
@@ -2,17 +2,17 @@
 
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 venv:
-	python3.8 -m venv env
+	python3.8 -m venv env; \
+	. env/bin/activate; \
+	python -m pip install pip==23.0.1
 
 install: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install -e ../_delphi_utils_python ;\
 	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install wheel ; \
 	pip install ../_delphi_utils_python ;\
 	pip install .
 
diff --git a/sir_complainsalot/setup.py b/sir_complainsalot/setup.py
index 157c001b2..4346a1b1b 100644
--- a/sir_complainsalot/setup.py
+++ b/sir_complainsalot/setup.py
@@ -6,6 +6,7 @@
     "darker[isort]~=2.1.1",
     "delphi-utils",
     "pandas",
+    "pydocstyle",
     "pylint==2.8.3",
     "pytest-cov",
     "pytest",