From 567c390d653751d06d4087485e2ac67a7eb0d0c7 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Thu, 12 Sep 2024 14:08:50 +0200
Subject: [PATCH] Add back more backend requirements
---
.gitlab-ci.yml | 6 +++++-
backend/requirements.in | 9 ++++----
backend/requirements.txt | 45 ++++++++++++++++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1140d14..4d66d063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
CHART_NAME: stackspin-dashboard
CHART_DIR: deployment/helmchart/
-build-project:
+yarn:
stage: build-project
before_script: []
script:
@@ -42,6 +42,8 @@ build-project:
build-frontend-image:
stage: build-image
+ needs:
+ - yarn
image:
# We need a shell to provide the registry credentials, so we need to use the
# kaniko debug image (https://github.com/GoogleContainerTools/kaniko#debug-image)
@@ -58,6 +60,7 @@ build-frontend-image:
build-backend-image:
stage: build-image
+ needs: []
variables:
KANIKO_BUILD_IMAGENAME: dashboard-backend
DIRECTORY: backend
@@ -71,6 +74,7 @@ build-backend-image:
build-test-image:
stage: build-image
+ needs: []
variables:
KANIKO_BUILD_IMAGENAME: cypress-test
DIRECTORY: tests
diff --git a/backend/requirements.in b/backend/requirements.in
index c03c6e99..7c46d337 100644
--- a/backend/requirements.in
+++ b/backend/requirements.in
@@ -2,12 +2,13 @@ APScheduler==3.10.4
# CLI creation kit
click==8.1.7
Flask==3.0.3
-# Flask-Cors==3.0.10
-# flask-expects-json==1.7.0
+Flask-Cors==5.0.0
+flask-expects-json==1.7.0
Flask-JWT-Extended==4.6.0
-# Flask-Migrate==4.0.1
+Flask-Migrate==4.0.7
Flask-SQLAlchemy==3.1.1
-# jsonschema==4.4.0
+gunicorn==23.0.0
+jsonschema==4.23.0
# Jinja2==3.0.3
# jinja2-base64-filters==0.1.4
kubernetes==30.1.0
diff --git a/backend/requirements.txt b/backend/requirements.txt
index c31b8890..80c56fe2 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -4,10 +4,16 @@
#
# pip-compile --no-emit-index-url --output-file=requirements.txt --strip-extras requirements.in
#
+alembic==1.13.2
+ # via flask-migrate
annotated-types==0.7.0
# via pydantic
apscheduler==3.10.4
# via -r requirements.in
+attrs==24.2.0
+ # via
+ # jsonschema
+ # referencing
blinker==1.8.2
# via flask
cachetools==5.5.0
@@ -25,27 +31,49 @@ click==8.1.7
flask==3.0.3
# via
# -r requirements.in
+ # flask-cors
+ # flask-expects-json
# flask-jwt-extended
+ # flask-migrate
# flask-sqlalchemy
+flask-cors==5.0.0
+ # via -r requirements.in
+flask-expects-json==1.7.0
+ # via -r requirements.in
flask-jwt-extended==4.6.0
# via -r requirements.in
-flask-sqlalchemy==3.1.1
+flask-migrate==4.0.7
# via -r requirements.in
+flask-sqlalchemy==3.1.1
+ # via
+ # -r requirements.in
+ # flask-migrate
google-auth==2.34.0
# via kubernetes
greenlet==3.0.3
# via sqlalchemy
+gunicorn==23.0.0
+ # via -r requirements.in
idna==3.8
# via requests
itsdangerous==2.2.0
# via flask
jinja2==3.1.4
# via flask
+jsonschema==4.23.0
+ # via
+ # -r requirements.in
+ # flask-expects-json
+jsonschema-specifications==2023.12.1
+ # via jsonschema
kubernetes==30.1.0
# via -r requirements.in
+mako==1.3.5
+ # via alembic
markupsafe==2.1.5
# via
# jinja2
+ # mako
# werkzeug
namedatomiclock==1.1.3
# via -r requirements.in
@@ -57,6 +85,8 @@ ory-hydra-client==2.2.0
# via -r requirements.in
ory-kratos-client==1.2.0
# via -r requirements.in
+packaging==24.1
+ # via gunicorn
pip-install==1.3.5
# via -r requirements.in
posix-ipc==1.1.1
@@ -86,6 +116,10 @@ pyyaml==6.0.2
# via
# -r requirements.in
# kubernetes
+referencing==0.35.1
+ # via
+ # jsonschema
+ # jsonschema-specifications
regex==2024.9.11
# via -r requirements.in
requests==2.32.3
@@ -97,6 +131,10 @@ requests-oauthlib==2.0.0
# via
# -r requirements.in
# kubernetes
+rpds-py==0.20.0
+ # via
+ # jsonschema
+ # referencing
rsa==4.9
# via google-auth
six==1.16.0
@@ -105,9 +143,12 @@ six==1.16.0
# kubernetes
# python-dateutil
sqlalchemy==2.0.34
- # via flask-sqlalchemy
+ # via
+ # alembic
+ # flask-sqlalchemy
typing-extensions==4.12.2
# via
+ # alembic
# ory-kratos-client
# pydantic
# pydantic-core
--
GitLab