Make pip dependencies consistent with KPI

kobotoolbox · May 3, 2022 · 60f0453 · 60f0453
1 parent 21d7b60
commit 60f0453
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 276 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Install apt dependencies
       run: sudo apt-get install ghostscript libxml2-dev libxslt-dev python3-dev gdal-bin libproj-dev gettext postgresql-client openjdk-11-jre
     - name: Install Python dependencies
-      run: pip install -r dependencies/pip/dev.txt
+      run: pip install -r dependencies/pip/dev_requirements.txt
     - name: Run pytest
       run: pytest -vv -rf
       env:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ test:
       alias: redis_cache
   script:
     - apt-get update && apt-get install -y ghostscript gdal-bin libproj-dev gettext openjdk-11-jre
-    - pip install -r dependencies/pip/dev.txt
+    - pip install -r dependencies/pip/dev_requirements.txt
     - pytest -vv -rf
 
 deploy-beta:

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN python3 -m venv "$VIRTUAL_ENV"
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN pip install  --quiet --upgrade pip && \
     pip install  --quiet pip-tools
-COPY ./dependencies/pip/prod.txt "${TMP_DIR}/pip_dependencies.txt"
+COPY ./dependencies/pip/requirements.txt "${TMP_DIR}/pip_dependencies.txt"
 RUN pip-sync "${TMP_DIR}/pip_dependencies.txt" 1>/dev/null
 
 FROM python:3.10-slim
@@ -79,7 +79,7 @@ RUN adduser --disabled-password --gecos '' "$UWSGI_USER"
 
 # Copy virtualenv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-COPY ./dependencies/pip/prod.txt "${TMP_DIR}/pip_dependencies.txt"
+COPY ./dependencies/pip/requirements.txt "${TMP_DIR}/pip_dependencies.txt"
 COPY --from=build-python "$VIRTUAL_ENV" "$VIRTUAL_ENV"
 COPY . "${KOBOCAT_SRC_DIR}"
 

diff --git a/dependencies/pip/dev.in → dependencies/pip/dev_requirements.in b/dependencies/pip/dev.in → dependencies/pip/dev_requirements.in
diff --git a/dependencies/pip/dev.txt → dependencies/pip/dev_requirements.txt b/dependencies/pip/dev.txt → dependencies/pip/dev_requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile dependencies/pip/dev.in
+#    pip-compile dependencies/pip/dev_requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@419f7306443f9a800b07d832b2cc147941062d59#egg=django_digest
     # via -r dependencies/pip/requirements.in
@@ -152,16 +152,16 @@ executing==0.8.3
 gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 httmock==1.4.0
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 idna==3.3
     # via requests
 iniconfig==1.1.1
     # via pytest
 ipdb==0.13.9
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 ipython==8.2.0
     # via
-    #   -r dependencies/pip/dev.in
+    #   -r dependencies/pip/dev_requirements.in
     #   ipdb
 jedi==0.18.1
     # via ipython
@@ -184,11 +184,11 @@ markdown==3.3.6
 matplotlib-inline==0.1.3
     # via ipython
 mock==4.0.3
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 modilabs-python-utils==0.1.5
     # via -r dependencies/pip/requirements.in
 mongomock==4.0.0
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 numpy==1.22.3
     # via pandas
 oauthlib==3.2.0
@@ -238,13 +238,13 @@ pyparsing==3.0.8
     # via packaging
 pytest==7.1.2
     # via
-    #   -r dependencies/pip/dev.in
+    #   -r dependencies/pip/dev_requirements.in
     #   pytest-django
     #   pytest-env
 pytest-django==4.5.2
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 pytest-env==0.6.2
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 python-crontab==2.6.0
     # via django-celery-beat
 python-dateutil==2.8.2
@@ -279,7 +279,7 @@ sentinels==1.0.0
 sentry-sdk==1.5.10
     # via -r dependencies/pip/requirements.in
 shell-command==0.1
-    # via -r dependencies/pip/dev.in
+    # via -r dependencies/pip/dev_requirements.in
 simplejson==3.17.6
     # via -r dependencies/pip/requirements.in
 six==1.16.0
@@ -292,7 +292,7 @@ six==1.16.0
     #   python-dateutil
 sqlparse==0.4.2
     # via
-    #   -r dependencies/pip/dev.in
+    #   -r dependencies/pip/dev_requirements.in
     #   django
 stack-data==0.2.0
     # via ipython
@@ -313,6 +313,8 @@ urllib3==1.26.9
     #   botocore
     #   requests
     #   sentry-sdk
+uwsgi==2.0.20
+    # via -r dependencies/pip/requirements.in
 vine==5.0.0
     # via
     #   amqp

diff --git a/dependencies/pip/prod.in b/dependencies/pip/prod.in
diff --git a/dependencies/pip/prod.txt b/dependencies/pip/prod.txt
diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
@@ -87,3 +87,6 @@ sentry-sdk
 
 # mimetype detection
 Werkzeug<=2.0.3
+
+# WSGI server
+uWSGI
diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -233,6 +233,8 @@ urllib3==1.26.9
     #   botocore
     #   requests
     #   sentry-sdk
+uwsgi==2.0.20
+    # via -r dependencies/pip/requirements.in
 vine==5.0.0
     # via
     #   amqp