Merge branch 'main' of https://github.com/SatcherInstitute/health-equ…

…ity-tracker
benhammondmusic · Jun 20, 2024 · e3afb74 · e3afb74
2 parents 1beb875 + 2b50a42
commit e3afb74
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 47 deletions.
diff --git a/data_server/Dockerfile b/data_server/Dockerfile
@@ -10,6 +10,7 @@ ENV APP_HOME /app
 WORKDIR $APP_HOME
 COPY ./data_server ./data_server
 COPY ./python/data_server ./python/data_server
+COPY ./shared_requirements ./shared_requirements
 
 # Install production dependencies.
 RUN python -m pip install --upgrade pip

diff --git a/data_server/requirements.txt b/data_server/requirements.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=data_server/requirements.txt data_server/requirements.in
-#
+-r ../shared_requirements/requirements.txt
 blinker==1.8.2
     # via flask
 cachetools==5.3.3
@@ -80,7 +75,5 @@ requests==2.32.0
     #   google-cloud-storage
 rsa==4.7
     # via google-auth
-urllib3==1.26.19
-    # via requests
 werkzeug==3.0.3
     # via flask
diff --git a/exporter/Dockerfile b/exporter/Dockerfile
@@ -9,6 +9,7 @@ ENV PYTHONUNBUFFERED True
 ENV APP_HOME /app
 WORKDIR $APP_HOME
 COPY ./exporter ./exporter
+COPY ./shared_requirements ./shared_requirements
 
 # Install production dependencies.
 RUN python -m pip install --upgrade pip

diff --git a/exporter/requirements.txt b/exporter/requirements.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
-#
-#    pip-compile --output-file=exporter/requirements.txt exporter/requirements.in
-#
+-r ../shared_requirements/requirements.txt
 blinker==1.8.2
     # via flask
 cachetools==5.2.0
@@ -135,8 +130,6 @@ six==1.16.0
     # via python-dateutil
 tzdata==2024.1
     # via pandas
-urllib3==1.26.19
-    # via requests
 werkzeug==3.0.3
     # via flask
 zipp==3.8.1

diff --git a/python/tests/requirements.txt b/python/tests/requirements.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=python/tests/requirements.txt python/tests/requirements.in
-#
+-r ../../shared_requirements/requirements.txt
 astroid==3.2.2
     # via pylint
 cachetools==4.2.4
@@ -136,8 +131,6 @@ typing-inspect==0.6.0
     # via libcst
 tzdata==2024.1
     # via pandas
-urllib3==2.2.2
-    # via requests
 xlrd==2.0.1
     # via -r ../ingestion/requirements.in
 

diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=requirements/tests.txt requirements/tests.in
-#
+-r ../shared_requirements/requirements.txt
 astroid==3.2.2
     # via pylint
 blinker==1.8.2
@@ -173,8 +168,6 @@ typing-inspect==0.6.0
     # via libcst
 tzdata==2024.1
     # via pandas
-urllib3==1.26.19
-    # via requests
 werkzeug==3.0.3
     # via flask
 xlrd==2.0.1

diff --git a/run_gcs_to_bq/Dockerfile b/run_gcs_to_bq/Dockerfile
@@ -12,6 +12,7 @@ WORKDIR $APP_HOME
 COPY ./run_gcs_to_bq ./run_gcs_to_bq
 COPY ./python ./python
 COPY ./data ./data
+COPY ./shared_requirements ./shared_requirements
 
 # Install production dependencies.
 RUN python -m pip install --upgrade pip

diff --git a/run_gcs_to_bq/requirements.txt b/run_gcs_to_bq/requirements.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile requirements.in
-#
+-r ../shared_requirements/requirements.txt
 cachetools==4.1.1         # via google-auth
 certifi==2020.6.20        # via requests
 cffi==1.15.1              # via google-crc32c
@@ -45,7 +40,6 @@ rsa==4.6                  # via google-auth
 six==1.15.0               # via google-api-core, google-auth, google-cloud-bigquery, google-resumable-media, grpcio, protobuf, python-dateutil
 typing-extensions==4  # via libcst, typing-inspect
 typing-inspect==0.6.0     # via libcst
-urllib3==1.25.10          # via requests
 werkzeug==1.0.1           # via flask
 xlrd==1.2.0               # via -r ../python/ingestion/requirements.in
 

diff --git a/run_ingestion/Dockerfile b/run_ingestion/Dockerfile
@@ -11,6 +11,7 @@ ENV APP_HOME /app
 WORKDIR $APP_HOME
 COPY ./run_ingestion ./run_ingestion
 COPY ./python ./python
+COPY ./shared_requirements ./shared_requirements
 
 # Install production dependencies.
 RUN python -m pip install --upgrade pip

diff --git a/run_ingestion/requirements.txt b/run_ingestion/requirements.txt
@@ -1,9 +1,4 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile requirements.in
-#
+-r ../shared_requirements/requirements.txt
 astroid==3.2.2
     # via pylint
 cachetools==4.1.1
@@ -143,8 +138,6 @@ typing-inspect==0.6.0
     # via libcst
 tzdata==2024.1
     # via pandas
-urllib3==1.25.10
-    # via requests
 werkzeug==1.0.1
     # via flask
 xlrd==2.0.1

diff --git a/shared_requirements/requirements.txt b/shared_requirements/requirements.txt
@@ -0,0 +1 @@
+urllib3