From 126b70634502c68e660c6a3a9ff10ae2848dae26 Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@uni.lu>
Date: Mon, 30 Sep 2024 15:51:05 +0200
Subject: [PATCH] rollback to adding db requirements in pip
---
.gitlab-ci.yml | 4 ----
requirements.txt | 2 ++
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cf1993a..1020eb33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,6 @@ test_migrations_created_postgres:
- postgres:latest
script:
- cp "local_settings_ci.py" "smash/smash/local_settings.py"
- - pip install "psycopg2==2.9.9"
- cd smash
- python manage.py makemigrations --check --dry-run
- test 1 = $(python manage.py makemigrations --check --dry-run | grep 'No changes detected' |wc -l)
@@ -45,7 +44,6 @@ test_migrations_created_mariadb:
- mariadb:10.6-ubi
script:
- cp "local_settings_ci_mariadb.py" "smash/smash/local_settings.py"
- - pip install "mysqlclient==2.2.4"
- cd smash
- python manage.py makemigrations --check --dry-run
- test 1 = $(python manage.py makemigrations --check --dry-run | grep 'No changes detected' |wc -l)
@@ -56,7 +54,6 @@ test_postgres:
- postgres:latest
script:
- cp "local_settings_ci.py" "smash/smash/local_settings.py"
- - pip install "psycopg2==2.9.9"
- cd smash
- coverage run --source web manage.py test -v3
- coverage report -m --omit="*/test*,*/migrations*,*debug_utils*"
@@ -67,7 +64,6 @@ test_mariadb:
- mariadb:10.6-ubi
script:
- cp "local_settings_ci_mariadb.py" "smash/smash/local_settings.py"
- - pip install "mysqlclient==2.2.4"
- cd smash
- sleep 10
- coverage run --source web manage.py test --noinput -v3
diff --git a/requirements.txt b/requirements.txt
index b575d0f3..2b48025a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,6 +31,7 @@ luhn==0.2.0
lxml==4.9.3
matplotlib==3.8.1
mockito==1.4.0
+mysqlclient==2.2.4
nexmo==2.5.2
numpy==1.26.1
pandas==2.1.2
@@ -38,6 +39,7 @@ packaging==23.2
django-datatables-view==1.20.0
phonenumberslite==8.13.24
Pillow==10.1.0
+psycopg2==2.9.9
pycparser==2.21
pyexcel==0.7.0
pyexcel-io==0.6.6
--
GitLab