Merge pull request #22 from onaio/kpi-setuptools-config

Add ability to specify `setuptools` version

.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+---
+name: CI
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
+
+      - name: Run Molecule tests
+        uses: onaio/molecule-action@master

defaults/main.yml

@@ -14,7 +14,6 @@ kpi_system_requirements:
   - python-celery
   - python3-pip
   - python3-psycopg2
-  - python3-setuptools
   - software-properties-common
   - virtualenv
   - ttfautohint
@@ -27,6 +26,7 @@ kpi_npm_requirements:
 kpi_django_setup_commands:
   - collectstatic --noinput
   - compilemessages
+kpi_setuptools_version: "57.5.0"
 kpi_pip_paths: "{{ kpi_checkout_path }}/dependencies/pip/external_services.txt"
 kpi_local_settings_path: "{{ kpi_checkout_path }}/kobo/local_settings.py"
 kpi_settings_app_name: "kobo.local_settings"
@@ -45,7 +45,7 @@ kpi_python_version: python{{ kpi_python_source_version }}
 kpi_checkout_path: "{{ kpi_versioned_path }}/{{ kpi_git_branch }}"
 kpi_app_path: "{{ kpi_system_user_home }}/app"
 kpi_versioned_path: "{{ kpi_app_path }}-versioned"
-kpi_git_branch: kpi_2.0
+kpi_git_branch: "ona-custom-changes"
 kpi_service_name: "{{ kpi_system_user }}"
 kpi_venv_path: "{{ kpi_system_user_home }}/.virtualenvs/{{ kpi_service_name }}"
 kpi_nvm_install_path: "{{ kpi_system_user_home }}/.nvm"

meta/main.yml

@@ -55,6 +55,7 @@ dependencies:
     django_wsgi_group: "{{ kpi_wsgi_group }}"
     django_python_packages: "{{ kpi_python_packages }}"
     django_manage_services: "{{ kpi_django_manage_services }}"
+    django_setuptools_version: "{{ kpi_setuptools_version }}"
 
   - role: onaio.collectd
     collectd_scripts: "{{ kpi_collectd_scripts }}"

molecule/default/converge.yml

@@ -8,4 +8,3 @@
       kpi_pgsql_password: kpi
       kpi_enable_monitoring: false
       kpi_git_url: "https://github.com/onaio/kpi.git"
-      kpi_git_branch: "kpi_2.0"