Skip to content

Commit

Permalink
upgrade python 3.10 and prod dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
BorjaEst committed Nov 29, 2023
1 parent daaf458 commit b6608f1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ================================== BUILDER ===================================
ARG INSTALL_PYTHON_VERSION=3.8
ARG INSTALL_PYTHON_VERSION=3.10
ARG PYTHON_IMAGE_TAG=slim-buster
FROM python:${INSTALL_PYTHON_VERSION}-${PYTHON_IMAGE_TAG} AS backend

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cicd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker image for running CI/CD tests of the backend using JePL
# ================================== BUILDER ===================================
ARG INSTALL_PYTHON_VERSION=3.8
ARG INSTALL_PYTHON_VERSION=3.10
ARG PYTHON_IMAGE_TAG=slim-buster
FROM python:${INSTALL_PYTHON_VERSION}-${PYTHON_IMAGE_TAG} AS backend

Expand Down
2 changes: 1 addition & 1 deletion backend/utils/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def decorator(*args, **kwargs):
per_page = query_args.pop("per_page")
page = query_args.pop("page")
query = func(*args, **kwargs)
return query.paginate(page, per_page)
return query.paginate(page=page, per_page=per_page)
return decorator
return decorator_add_sorting

Expand Down
36 changes: 18 additions & 18 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# Everything needed in production

# Flask
flask~=2.1.0
flask < 3.0.0

# Database
flask-SQLAlchemy~=2.5.1
SQLAlchemy~=1.4.1
psycopg2-binary~=2.9.3
flask-SQLAlchemy ~= 3.0.5
SQLAlchemy < 2.0.0
psycopg2-binary

# Migrations
flask-migrate~=3.0.0
flask-migrate ~= 4.0.5

# Schemas
marshmallow~=3.13.0
jsonschema~=3.2.0
marshmallow ~= 3.20.1
jsonschema ~= 4.20.0

# REST GUI
flask-smorest~=0.37.0
flask-smorest ~= 0.42.2

# Deployment in production
gevent~=23.9.1
gunicorn~=20.1.0
supervisor~=4.2.2
gevent ~= 23.9.1
gunicorn ~= 21.2.0
supervisor ~= 4.2.5

# Auth
flaat~=1.1.1
requests~=2.27.1
flaat ~= 1.1.14
requests ~= 2.31.0

# Notifications
flask-mailman~=0.3.0
blinker~=1.4.0
flask-mailman ~= 1.0.0
blinker ~= 1.7.0

# Environment variable parsing
environs~=9.3.5
environs ~= 9.5.0

# Time control
pytz~=2022.1
pytz ~= 2023.1

# Containers
udocker == 1.3.4
udocker ~= 1.3.12
6 changes: 1 addition & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ envlist =
clean,
stylecheck,
bandit,
py38,
py39,
py310,
report

[pytest]
Expand All @@ -27,9 +26,6 @@ skip_install = True
deps =
-r{toxinidir}/requirements/prod.txt
-r{toxinidir}/requirements/dev.txt
#depends =
# py39: clean
# report: py39
commands =
pytest \
--basetemp="{envtmpdir}" \
Expand Down

0 comments on commit b6608f1

Please sign in to comment.