From 1fa30ad4a3c445e41ea34dd9d93cf2fa39d7e6ab Mon Sep 17 00:00:00 2001
From: Olivier Leger <olivierleger@gmail.com>
Date: Tue, 26 Apr 2022 12:09:15 -0400
Subject: [PATCH] Apply requested changes for PR#811

---
 .gitlab-ci.yml                    | 2 +-
 Dockerfile                        | 3 +--
 dependencies/pip/dev.txt          | 7 +------
 dependencies/pip/prod.txt         | 7 +------
 dependencies/pip/requirements.in  | 2 +-
 dependencies/pip/requirements.txt | 7 +------
 pip-compile.sh                    | 6 ++++++
 7 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2371e3be..e9edbbd3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build:
 
 test:
   stage: build_test
-  image: python:3.8
+  image: python:10
   variables:
     DJANGO_SECRET_KEY: abcdef
     TEST_DATABASE_URL: postgis://kobo:kobo@postgres:5432/kobocat_test
diff --git a/Dockerfile b/Dockerfile
index 24925c0c8..1566339b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,13 +52,12 @@ RUN mkdir -p ${NGINX_STATIC_DIR} && \
 RUN apt-get -qq update && \
     apt-get -qq -y install \
         cron \
-        gcc \
         gdal-bin \
         gettext \
         git \
         gosu \
         less \
-        libpq-dev \
+        libpq5 \
         libproj-dev \
         libsqlite3-mod-spatialite \
         locales \
diff --git a/dependencies/pip/dev.txt b/dependencies/pip/dev.txt
index a8d381b40..c4bdecc7d 100644
--- a/dependencies/pip/dev.txt
+++ b/dependencies/pip/dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile dependencies/pip/dev.in
@@ -153,8 +153,6 @@ httmock==1.4.0
     # via -r dependencies/pip/dev.in
 idna==3.3
     # via requests
-importlib-metadata==4.11.3
-    # via markdown
 iniconfig==1.1.1
     # via pytest
 ipdb==0.13.9
@@ -254,7 +252,6 @@ python-dateutil==2.8.2
     #   python-crontab
 pytz==2022.1
     # via
-    #   -r dependencies/pip/requirements.in
     #   celery
     #   django
     #   django-timezone-field
@@ -329,8 +326,6 @@ xlrd==2.0.1
     # via pyxform
 xlwt==1.3.0
     # via -r dependencies/pip/requirements.in
-zipp==3.8.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/dependencies/pip/prod.txt b/dependencies/pip/prod.txt
index fd0e6d691..98318ad2b 100644
--- a/dependencies/pip/prod.txt
+++ b/dependencies/pip/prod.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile dependencies/pip/prod.in
@@ -139,8 +139,6 @@ gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 idna==3.3
     # via requests
-importlib-metadata==4.11.3
-    # via markdown
 jmespath==1.0.0
     # via
     #   boto3
@@ -194,7 +192,6 @@ python-dateutil==2.8.2
     #   python-crontab
 pytz==2022.1
     # via
-    #   -r dependencies/pip/requirements.in
     #   celery
     #   django
     #   django-timezone-field
@@ -251,5 +248,3 @@ xlrd==2.0.1
     # via pyxform
 xlwt==1.3.0
     # via -r dependencies/pip/requirements.in
-zipp==3.8.0
-    # via importlib-metadata
diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
index 58ca3adea..03bb72e0b 100644
--- a/dependencies/pip/requirements.in
+++ b/dependencies/pip/requirements.in
@@ -32,7 +32,7 @@ pyxform==1.9.0
 django-reversion<3.0.2
 xlwt
 openpyxl
-celery>=5
+celery
 celery[redis]
 amqp
 # new export code relies on
diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
index ffd560689..4d61d7443 100644
--- a/dependencies/pip/requirements.txt
+++ b/dependencies/pip/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile dependencies/pip/requirements.in
@@ -139,8 +139,6 @@ gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 idna==3.3
     # via requests
-importlib-metadata==4.11.3
-    # via markdown
 jmespath==1.0.0
     # via
     #   boto3
@@ -194,7 +192,6 @@ python-dateutil==2.8.2
     #   python-crontab
 pytz==2022.1
     # via
-    #   -r dependencies/pip/requirements.in
     #   celery
     #   django
     #   django-timezone-field
@@ -249,5 +246,3 @@ xlrd==2.0.1
     # via pyxform
 xlwt==1.3.0
     # via -r dependencies/pip/requirements.in
-zipp==3.8.0
-    # via importlib-metadata
diff --git a/pip-compile.sh b/pip-compile.sh
index 8d1fd9d31..78bc49a3a 100755
--- a/pip-compile.sh
+++ b/pip-compile.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+#
+if [ -z "$(dpkg -l|grep 'libpq-dev')" ]; then
+  echo "Installing dependencies needed to pip-compile..."
+  apt-get -qq update && apt-get -qq -y install gcc libpq-dev
+fi
+
 for in_file in dependencies/pip/*.in
 do
     # pass any arguments to pip-compile