Merge pull request #2001 from cmu-delphi/revert-1984-1973-clean-up-delphi_utils

Revert "Clean up delphi_utils "

Author: melange396

.github/workflows/python-ci.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           python-version: 3.8
           cache: "pip"
-          cache-dependency-path: "pyproject.toml"
+          cache-dependency-path: "setup.py"
       - name: Install testing dependencies
         run: |
           python -m pip install --upgrade pip

_delphi_utils_python/.bumpversion.cfg

@@ -4,6 +4,6 @@ commit = True
 message = chore: bump delphi_utils to {new_version}
 tag = False
 
-[bumpversion:file:pyproject.toml]
+[bumpversion:file:setup.py]
 
 [bumpversion:file:delphi_utils/__init__.py]

_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 -e '.[dev]'
+pip install .
 ```
 
 As described in each of the indicator code directories, you will want to install

_delphi_utils_python/Makefile

@@ -6,12 +6,12 @@ venv:
 install: venv
 	. env/bin/activate; \
 	pip install wheel ; \
-	pip install -e '.[dev]'
+	pip install -e .
 
 install-ci: venv
 	. env/bin/activate; \
-	pip install 'build[virtualenv]' pylint pytest pydocstyle wheel twine ; \
-	pip install '.[dev]'
+	pip install wheel ; \
+	pip install .
 
 lint:
 	. env/bin/activate; pylint delphi_utils --rcfile=../pyproject.toml
@@ -30,5 +30,4 @@ clean:
 
 release: lint test
 	. env/bin/activate ; \
-	pip install 'build[virtualenv]' ; \
-    python -m build --sdist --wheel
+	python setup.py sdist bdist_wheel

_delphi_utils_python/pyproject.toml

@@ -0,0 +1,48 @@
+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']}
+)

_delphi_utils_python/setup.py

@@ -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:

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:

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:

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:

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:

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:

nchs_mortality/Makefile

@@ -2,12 +2,10 @@
 from setuptools import find_packages
 
 required = [
-    "boto3",
     "darker[isort]~=2.1.1",
     "delphi-utils",
     "epiweeks",
     "freezegun",
-    "moto~=4.2.14",
     "numpy",
     "pandas",
     "pydocstyle",

nchs_mortality/setup.py

@@ -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:

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:

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:

quidel_covidtest/Makefile

@@ -2,7 +2,6 @@
 from setuptools import find_packages
 
 required = [
-    "boto3",
     "covidcast",
     "darker[isort]~=2.1.1",
     "delphi-utils",

quidel_covidtest/setup.py

@@ -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: