From 50ffc189d1bc72810706e36ac667d05ab4ee3222 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 7 Jan 2024 16:12:54 +0100
Subject: [PATCH] Use vars
---
.gitlab-ci.yml | 8 +++-
dbrepo-analyse-service/Pipfile | 1 +
dbrepo-analyse-service/Pipfile.lock | 60 +++++++++--------------------
3 files changed, 25 insertions(+), 44 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a2c8889bd..5b906f707f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,9 +29,11 @@ build-metadata-service:
build-analyse-service:
image: python:3.9-slim
stage: build
+ variables:
+ PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
script:
- "pip install pipenv"
- - "cd ./dbrepo-analyse-service && pipenv install gunicorn && pipenv install --system --deploy"
+ - "pipenv install gunicorn && pipenv install --system --deploy"
build-data-service:
image: maven:3-openjdk-17
@@ -108,11 +110,13 @@ test-data-service:
test-analyse-service:
image: python:3.9-slim
stage: test
+ variables:
+ PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
needs:
- build-analyse-service
script:
- "pip install pipenv"
- - "cd ./dbrepo-analyse-service && pipenv install gunicorn && pipenv install --system --deploy"
+ - "pipenv install gunicorn && pipenv install --system --deploy"
- "cd ./dbrepo-analyse-service/ && coverage run -m pytest test/test_determine_dt.py test/test_determine_pk.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt"
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 64506001f7..e34da6b06e 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -14,6 +14,7 @@ numpy = "*"
pandas = "*"
messytables = "*"
minio = "*"
+gunicorn = "*"
[dev-packages]
coverage = "*"
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index f58a22f7e5..1000eddec9 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "a1f2627de92c55ef51798cf33ba26a677efbdf53867b06f349e4cb4f042a291f"
+ "sha256": "fe382056038fea58538a52ab9f8ac7bd80659537f8336a534cb79a71e515bceb"
},
"pipfile-spec": 6,
"requires": {
@@ -391,9 +391,17 @@
"sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da",
"sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"
],
- "markers": "python_version < '3.11' and platform_python_implementation == 'CPython'",
+ "markers": "python_version >= '3.11' and platform_python_implementation == 'CPython'",
"version": "==3.0.3"
},
+ "gunicorn": {
+ "hashes": [
+ "sha256:3213aa5e8c24949e792bcacfc176fef362e7aac80b76c56f6b5122bf350722f0",
+ "sha256:88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033"
+ ],
+ "index": "pypi",
+ "version": "==21.2.0"
+ },
"html5lib": {
"hashes": [
"sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d",
@@ -410,14 +418,6 @@
"markers": "python_version >= '3.5'",
"version": "==3.6"
},
- "importlib-metadata": {
- "hashes": [
- "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e",
- "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"
- ],
- "markers": "python_version < '3.10'",
- "version": "==7.0.1"
- },
"itsdangerous": {
"hashes": [
"sha256:2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44",
@@ -1031,11 +1031,11 @@
},
"urllib3": {
"hashes": [
- "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07",
- "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"
+ "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84",
+ "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
- "version": "==1.26.18"
+ "markers": "python_version >= '3.7'",
+ "version": "==2.0.7"
},
"webencodings": {
"hashes": [
@@ -1060,14 +1060,6 @@
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
"version": "==2.0.1"
},
- "zipp": {
- "hashes": [
- "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31",
- "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==3.17.0"
- },
"zope.event": {
"hashes": [
"sha256:2832e95014f4db26c47a13fdaef84cef2f4df37e66b59d8f1f4a8f319a632c26",
@@ -1383,14 +1375,6 @@
"markers": "python_version >= '3.8'",
"version": "==7.0.0"
},
- "exceptiongroup": {
- "hashes": [
- "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14",
- "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"
- ],
- "index": "pypi",
- "version": "==1.2.0"
- },
"idna": {
"hashes": [
"sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca",
@@ -1506,14 +1490,6 @@
"index": "pypi",
"version": "==0.0.1rc1"
},
- "tomli": {
- "hashes": [
- "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
- "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
- ],
- "markers": "python_version < '3.11'",
- "version": "==2.0.1"
- },
"typing-extensions": {
"hashes": [
"sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783",
@@ -1524,11 +1500,11 @@
},
"urllib3": {
"hashes": [
- "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07",
- "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"
+ "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84",
+ "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
- "version": "==1.26.18"
+ "markers": "python_version >= '3.7'",
+ "version": "==2.0.7"
},
"wrapt": {
"hashes": [
--
GitLab