Update how requirements are installed (#389)

.github/dependabot.yml

@@ -5,14 +5,6 @@ updates:
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: 'pip'
-    directory: '/provisioning/roles/publicdb/files'
-    schedule:
-      interval: 'weekly'
-    ignore:
-      - dependency-name: 'Django'
-        update-types: ['version-update:semver-major']
-
   - package-ecosystem: 'pip'
     directory: '/'
     schedule:

Dockerfile

@@ -24,11 +24,11 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK 1
 RUN conda update --yes conda
 
 # Install requirements
-COPY provisioning/roles/publicdb/files/requirements-conda.txt ./
+COPY requirements-conda.txt ./
 RUN conda install --yes --file requirements-conda.txt
 
-COPY provisioning/roles/publicdb/files/requirements-pip.txt ./
-RUN pip install -r requirements-pip.txt
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
 
 COPY requirements-dev.txt ./
 RUN pip install -r requirements-dev.txt

Makefile

@@ -1,8 +1,8 @@
 .PHONY: devinstall
 devinstall:
 	pip install --upgrade --upgrade-strategy eager -r requirements-dev.txt
-	conda install --quiet --yes --channel conda-forge --file provisioning/roles/publicdb/files/requirements-conda.txt
-	pip install -r provisioning/roles/publicdb/files/requirements-pip.txt
+	conda install --quiet --yes --channel conda-forge --file requirements-conda.txt
+	pip install -r requirements.txt
 
 .PHONY: test
 test: coveragetests linttest doctest ansibletest

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.3'
 services:
 
   postgres:

provisioning/roles/publicdb/tasks/main.yml

@@ -59,30 +59,20 @@
     path: "{{ publicdb_media }}/raw_data"
     state: directory
 
-- name: Copy conda requirements files
-  ansible.builtin.copy:
-    src: requirements-conda.txt
-    dest: "{{ publicdb_path }}requirements-conda.txt"
-
-- name: Copy pip requirements files
-  ansible.builtin.copy:
-    src: requirements-pip.txt
-    dest: "{{ publicdb_path }}requirements-pip.txt"
-
 - name: Create conda environment
   ansible.builtin.shell:
     cmd: "{{ miniconda_path }}/bin/conda create -n publicdb_venv python={{ publicdb_python_version }} --yes"
     creates: "{{ publicdb_venv }}"
 
 - name: Install conda packages in conda environment
   ansible.builtin.command:
-    cmd: "{{ miniconda_path }}/bin/conda install -n publicdb_venv --channel conda-forge --file {{ publicdb_path }}requirements-conda.txt --yes"
+    cmd: "{{ miniconda_path }}/bin/conda install -n publicdb_venv --channel conda-forge --file {{ publicdb_code }}requirements-conda.txt --yes"
   register: conda_result
   changed_when: "'Executing transaction' in conda_result.stdout"
 
 - name: Install packages in conda environment using pip
   ansible.builtin.pip:
-    requirements: "{{ publicdb_path }}requirements-pip.txt"
+    requirements: "{{ publicdb_code }}requirements.txt"
     executable: "{{ publicdb_venv }}/bin/pip"
 
 - name: Setup the publicdb database in PostgreSQL

requirements-conda.txt

@@ -0,0 +1,2 @@
+hdf5==1.14.3
+uwsgi==2.0.20

requirements.txt

@@ -0,0 +1,10 @@
+Django~=4.2.11
+hisparc-sapphire==3.1.0
+ipython==8.25.0
+numpy==1.26.4
+psycopg2-binary==2.9.9
+python-dateutil==2.9.0.post0
+scipy==1.14.0
+sentry-sdk~=2.5.1
+supervisor==4.2.5
+tables==3.9.2